Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 25030200C13 for ; Mon, 6 Feb 2017 20:40:43 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 2399A160B62; Mon, 6 Feb 2017 19:40:43 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4E288160B56 for ; Mon, 6 Feb 2017 20:40:42 +0100 (CET) Received: (qmail 44872 invoked by uid 500); 6 Feb 2017 19:40:41 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 44846 invoked by uid 99); 6 Feb 2017 19:40:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Feb 2017 19:40:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4482DDFF17; Mon, 6 Feb 2017 19:40:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.apache.org Date: Mon, 06 Feb 2017 19:40:42 -0000 Message-Id: <1a521eefcd23493b902e541625a715b9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] geode git commit: GEODE-2431: Update to Awaitility 2.0 archived-at: Mon, 06 Feb 2017 19:40:43 -0000 http://git-wip-us.apache.org/repos/asf/geode/blob/ca5c7088/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java index 6c8ea79..c86405b 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java @@ -37,7 +37,7 @@ import org.apache.geode.test.dunit.LogWriterUtils; import org.apache.geode.test.dunit.VM; 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/ca5c7088/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java index 7837463..eba9add 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java @@ -20,7 +20,7 @@ import static org.apache.geode.test.dunit.Assert.*; 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.apache.logging.log4j.Logger; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/geode/blob/ca5c7088/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java index 08d9e07..ad50d28 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java @@ -48,7 +48,7 @@ import org.apache.geode.test.dunit.LogWriterUtils; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.junit.categories.DistributedTest; -import com.jayway.awaitility.Awaitility; +import org.awaitility.Awaitility; /** * DUnit for ParallelSenderQueue overflow operations. http://git-wip-us.apache.org/repos/asf/geode/blob/ca5c7088/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java index bf5b661..9b69446 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.internal.cache.wan.parallel; -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/ca5c7088/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java index 2368a8e..cf68ed0 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.internal.cache.wan.serial; -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/ca5c7088/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java index 64f94dd..e008627 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java @@ -24,7 +24,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.junit.Test; import org.junit.experimental.categories.Category; http://git-wip-us.apache.org/repos/asf/geode/blob/ca5c7088/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java index 64f0e62..1e78539 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; -import com.jayway.awaitility.Awaitility; +import org.awaitility.Awaitility; import org.junit.Test; import org.apache.geode.internal.cache.wan.WANTestBase; http://git-wip-us.apache.org/repos/asf/geode/blob/ca5c7088/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java index ca5f476..aee824d 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; import org.apache.geode.cache.wan.GatewaySender.OrderPolicy; import org.apache.geode.internal.cache.wan.WANTestBase; import org.apache.geode.test.dunit.AsyncInvocation; -import com.jayway.awaitility.Awaitility; +import org.awaitility.Awaitility; @Category(DistributedTest.class) public class SerialWANStatsDUnitTest extends WANTestBase { http://git-wip-us.apache.org/repos/asf/geode/blob/ca5c7088/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java index dc801be..03c0d62 100644 --- a/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java @@ -19,7 +19,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/ca5c7088/gradle/dependency-versions.properties ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties index fbc76e0..88a4c9a 100644 --- a/gradle/dependency-versions.properties +++ b/gradle/dependency-versions.properties @@ -19,7 +19,7 @@ annotations.version = 3.0.0 antlr.version = 2.7.7 asm.version = 5.1 assertj-core.version = 3.4.1 -awaitility.version = 1.7.0 +awaitility.version = 2.0.0 bcel.version = 5.2 catch-exception.version = 1.4.4 catch-throwable.version = 1.4.4 http://git-wip-us.apache.org/repos/asf/geode/blob/ca5c7088/gradle/test.gradle ---------------------------------------------------------------------- diff --git a/gradle/test.gradle b/gradle/test.gradle index 40fa962..92fed38 100644 --- a/gradle/test.gradle +++ b/gradle/test.gradle @@ -37,7 +37,7 @@ subprojects { exclude module: 'junit-dep' } testCompile 'com.google.code.tempus-fugit:tempus-fugit:' + project.'tempus-fugit.version' - testCompile 'com.jayway.awaitility:awaitility:' + project.'awaitility.version' + testCompile 'org.awaitility:awaitility:' + project.'awaitility.version' testCompile 'edu.umd.cs.mtc:multithreadedtc:' + project.'multithreadedtc.version' testCompile 'eu.codearte.catch-exception:catch-exception:' + project.'catch-exception.version' testCompile 'eu.codearte.catch-exception:catch-throwable:' + project.'catch-throwable.version'