You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ab...@apache.org on 2020/04/09 23:37:31 UTC
[geode] branch develop updated: GEODE-7765: Update dependencies for
v1.13
This is an automated email from the ASF dual-hosted git repository.
abaker pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new e9993c1 GEODE-7765: Update dependencies for v1.13
e9993c1 is described below
commit e9993c15d88a5edd2a486fd64339deba37c24945
Author: Anthony Baker <ab...@apache.org>
AuthorDate: Sat Mar 28 15:35:15 2020 -0700
GEODE-7765: Update dependencies for v1.13
Update many but not all dependencies.
---
.../src/test/resources/expected-pom.xml | 96 +++++++++++-----------
.../gradle/plugins/DependencyConstraints.groovy | 62 +++++++-------
.../apache/geode/session/tests/TomcatInstall.java | 4 +-
.../MissingDiskStoreAcceptanceTest.java | 2 +-
...tandaloneClientManagementAPIAcceptanceTest.java | 2 +-
.../integrationTest/resources/assembly_content.txt | 42 +++++-----
.../resources/dependency_classpath.txt | 54 ++++++------
.../integrationTest/resources/expected_jars.txt | 22 +++--
.../geode/ClusterCommunicationsDUnitTest.java | 2 +-
.../api/AlertingServiceDistributedTest.java | 2 +-
.../ResourceManagerWithQueryMonitorDUnitTest.java | 2 +-
.../apache/geode/cache30/ReconnectDUnitTest.java | 4 +-
...ReconnectWithClusterConfigurationDUnitTest.java | 2 +-
.../apache/geode/distributed/LocatorDUnitTest.java | 2 +-
.../internal/DistributionAdvisorDUnitTest.java | 2 +-
...rverReadConflictTransactionDistributedTest.java | 2 +-
...ntServerTransactionFailoverDistributedTest.java | 2 +-
.../internal/cache/DeltaPropagationDUnitTest.java | 4 +-
.../cache/PartitionedRegionSingleHopDUnitTest.java | 4 +-
.../control/RebalanceOperationDistributedTest.java | 2 +-
...istributedRegionFunctionExecutionDUnitTest.java | 6 +-
...tColocatedPartitionedRegionDistributedTest.java | 2 +-
...tPartitionHangsDuringRestartRegressionTest.java | 2 +-
...PersistentPartitionedRegionDistributedTest.java | 2 +-
.../PersistentRVVRecoveryDUnitTest.java | 2 +-
.../PersistentRecoveryOrderDUnitTest.java | 2 +-
.../sockets/RedundancyLevelPart1DUnitTest.java | 2 +-
.../sockets/RedundancyLevelPart3DUnitTest.java | 2 +-
.../MeterSubregistryReconnectDistributedTest.java | 2 +-
.../LoggingWithReconnectDistributedTest.java | 2 +-
...butedSystemMXBeanWithAlertsDistributedTest.java | 2 +-
...stemMXBeanWithNotificationsDistributedTest.java | 2 +-
.../management/JMXMBeanReconnectDUnitTest.java | 2 +-
.../DeprecatedAgentLauncherIntegrationTest.java | 2 +-
.../AlertingServiceWithClusterIntegrationTest.java | 2 +-
.../distributed/LauncherIntegrationTestCase.java | 2 +-
.../ServerLauncherRemoteIntegrationTestCase.java | 2 +-
.../cache/PartitionedRegionCreationJUnitTest.java | 4 +-
.../cache/TXDetectReadConflictJUnitTest.java | 8 +-
.../backup/IncrementalBackupIntegrationTest.java | 2 +-
.../tier/sockets/ConnectionProxyJUnitTest.java | 7 +-
.../logging/MergeLogFilesIntegrationTest.java | 2 +-
.../DistributedSystemMXBeanIntegrationTest.java | 2 +-
.../cache/control/InternalResourceManagerTest.java | 2 +-
.../SingleThreadColocationLoggerTest.java | 2 +-
.../executor/AbstractExecutorGroupJUnitTest.java | 2 +-
.../concurrent/StoppableCountDownLatchTest.java | 4 +-
.../cache/PutAllClientServerDistributedTest.java | 2 +-
.../cache/tier/sockets/DurableClientTestBase.java | 16 ++--
.../tests/DistributedExecutorServiceRuleTest.java | 2 +-
.../MemberStarterRuleAwaitIntegrationTest.java | 2 +-
.../tests/SharedCountersRuleDistributedTest.java | 2 +-
.../AsyncInvocationTimeoutDistributedTest.java | 2 +-
.../dunit/tests/StackTraceDistributedTest.java | 2 +-
.../dunit/tests/VMDumpThreadsDistributedTest.java | 2 +-
.../apache/geode/test/dunit/AsyncInvocation.java | 2 +-
.../test/dunit/internal/VMEventNotifierTest.java | 2 +-
.../cli/util/LogExporterFileIntegrationTest.java | 4 +-
.../web/http/support/HttpRequesterTest.java | 3 +-
.../geode/test/awaitility/GeodeAwaitility.java | 26 ++----
.../apache/geode/test/process/ProcessWrapper.java | 2 +-
.../geode/test/awaitility/GeodeAwaitilityTest.java | 23 ++----
.../rules/ExecutorServiceRuleGetThreadsTest.java | 2 +-
.../test/junit/rules/ExpectedTimeoutRuleTest.java | 2 +-
.../gms/fd/GMSHealthMonitorJUnitTest.java | 2 +-
.../org/apache/geode/redis/RedisDistDUnitTest.java | 2 +-
.../org/apache/geode/redis/internal/GeoCoder.java | 8 +-
geode-wan/build.gradle | 2 +-
68 files changed, 233 insertions(+), 264 deletions(-)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index 3ff2ecf..cbea352 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
- <version>3.2.9</version>
+ <version>3.3.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -58,7 +58,7 @@
<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
- <version>2.7.3</version>
+ <version>2.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -76,7 +76,7 @@
<dependency>
<groupId>com.github.davidmoten</groupId>
<artifactId>geo</artifactId>
- <version>0.7.1</version>
+ <version>0.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -100,7 +100,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>28.1-jre</version>
+ <version>28.2-jre</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -112,7 +112,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>3.10.0</version>
+ <version>3.11.4</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -124,7 +124,13 @@
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-servlet</artifactId>
- <version>2.0.1</version>
+ <version>2.0.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ <version>8.11</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -136,7 +142,7 @@
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
- <version>3.0.9</version>
+ <version>3.0.11</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -154,7 +160,7 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
- <version>3.4.1</version>
+ <version>3.4.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -220,13 +226,13 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
- <version>4.8.52</version>
+ <version>4.8.68</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
- <version>1.2.1</version>
+ <version>1.4.1</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -244,7 +250,7 @@
<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId>
- <version>8.3.0</version>
+ <version>8.3.1</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -328,7 +334,7 @@
<dependency>
<groupId>net.openhft</groupId>
<artifactId>compiler</artifactId>
- <version>2.3.4</version>
+ <version>2.3.5</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -340,13 +346,13 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
- <version>6.20.0</version>
+ <version>6.22.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-test</artifactId>
- <version>6.20.0</version>
+ <version>6.22.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -358,13 +364,13 @@
<dependency>
<groupId>org.apache.bcel</groupId>
<artifactId>bcel</artifactId>
- <version>6.2</version>
+ <version>6.4.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.9</version>
+ <version>3.10</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -382,13 +388,13 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.10</version>
+ <version>4.5.12</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.4.12</version>
+ <version>4.4.13</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -400,25 +406,25 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>3.13.2</version>
+ <version>3.15.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>3.1.6</version>
+ <version>4.0.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.63</version>
+ <version>1.64</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
- <version>1.7.7</version>
+ <version>1.7.11</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -472,7 +478,7 @@
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
- <version>1.21</version>
+ <version>1.23</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -490,7 +496,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.28</version>
+ <version>1.7.30</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -538,19 +544,19 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.10.0</version>
+ <version>2.10.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.10.0</version>
+ <version>2.10.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.10.0</version>
+ <version>2.10.1</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -566,12 +572,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>nimbus-jose-jwt</artifactId>
- <version>8.11</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>com.palantir.docker.compose</groupId>
<artifactId>docker-compose-rule-core</artifactId>
<version>0.31.1</version>
@@ -586,13 +586,13 @@
<dependency>
<groupId>com.pholser</groupId>
<artifactId>junit-quickcheck-core</artifactId>
- <version>0.9</version>
+ <version>0.9.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.pholser</groupId>
<artifactId>junit-quickcheck-generators</artifactId>
- <version>0.9</version>
+ <version>0.9.1</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -622,31 +622,31 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>2.12.1</version>
+ <version>2.13.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.12.1</version>
+ <version>2.13.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
- <version>2.12.1</version>
+ <version>2.13.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
- <version>2.12.1</version>
+ <version>2.13.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>2.12.1</version>
+ <version>2.13.1</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -742,49 +742,49 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
- <version>5.2.3.RELEASE</version>
+ <version>5.3.1.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
- <version>5.2.3.RELEASE</version>
+ <version>5.3.1.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-ldap</artifactId>
- <version>5.2.3.RELEASE</version>
+ <version>5.3.1.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
- <version>5.2.3.RELEASE</version>
+ <version>5.3.1.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
- <version>5.2.3.RELEASE</version>
+ <version>5.3.1.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-core</artifactId>
- <version>5.2.3.RELEASE</version>
+ <version>5.3.1.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-client</artifactId>
- <version>5.2.3.RELEASE</version>
+ <version>5.3.1.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-jose</artifactId>
- <version>5.2.3.RELEASE</version>
+ <version>5.3.1.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index a975d3f..7123296 100644
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -35,15 +35,15 @@ class DependencyConstraints implements Plugin<Project> {
// Some of these are referenced below as well
deps.put("antlr.version", "2.7.7")
deps.put("commons-io.version", "2.6")
- deps.put("commons-lang3.version", "3.9")
+ deps.put("commons-lang3.version", "3.10")
deps.put("commons-validator.version", "1.6")
- deps.put("fastutil.version", "8.3.0")
+ deps.put("fastutil.version", "8.3.1")
deps.put("javax.transaction-api.version", "1.3")
deps.put("jgroups.version", "3.6.14.Final")
- deps.put("log4j.version", "2.12.1")
- deps.put("micrometer.version", "1.2.1")
+ deps.put("log4j.version", "2.13.1")
+ deps.put("micrometer.version", "1.4.1")
deps.put("shiro.version", "1.5.2")
- deps.put("slf4j-api.version", "1.7.28")
+ deps.put("slf4j-api.version", "1.7.30")
// These version numbers are used in testing various versions of tomcat and are consumed explicitly
// in will be called explicitly in the relevant extensions module, and respective configurations
@@ -51,8 +51,8 @@ class DependencyConstraints implements Plugin<Project> {
// specifying @zip in a dependency, the manner in which we consume them in custom configurations.
// This would possibly be corrected if they were proper source sets.
deps.put("tomcat6.version", "6.0.37")
- deps.put("tomcat7.version", "7.0.96")
- deps.put("tomcat8.version", "8.5.46")
+ deps.put("tomcat7.version", "7.0.99")
+ deps.put("tomcat8.version", "8.5.50")
deps.put("tomcat9.version", "9.0.12")
// The jetty version is also hard-coded in geode-assembly:test
@@ -61,13 +61,13 @@ class DependencyConstraints implements Plugin<Project> {
// These version numbers are consumed by protobuf configurations that are plugin-specific and not
// part of the typical Gradle dependency configurations.
- deps.put("protoc.version", "3.10.0")
+ deps.put("protoc.version", "3.11.4")
deps.put("protobuf-gradle-plugin.version", "0.8.10")
- deps.put("protobuf-java.version", "3.10.0")
+ deps.put("protobuf-java.version", "3.11.4")
// These versions are referenced in test.gradle, which is aggressively injected into all projects.
deps.put("junit.version", "4.12")
- deps.put("cglib.version", "3.2.9")
+ deps.put("cglib.version", "3.3.0")
return deps
}
@@ -86,24 +86,24 @@ class DependencyConstraints implements Plugin<Project> {
api(group: 'antlr', name: 'antlr', version: get('antlr.version'))
api(group: 'cglib', name: 'cglib', version: get('cglib.version'))
api(group: 'com.arakelian', name: 'java-jq', version: '0.10.1')
- api(group: 'com.carrotsearch.randomizedtesting', name: 'randomizedtesting-runner', version: '2.7.3')
+ api(group: 'com.carrotsearch.randomizedtesting', name: 'randomizedtesting-runner', version: '2.7.7')
api(group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-joda', version: '2.9.8')
api(group: 'com.fasterxml.jackson.module', name: 'jackson-module-scala_2.10', version: '2.10.0')
- api(group: 'com.github.davidmoten', name: 'geo', version: '0.7.1')
+ api(group: 'com.github.davidmoten', name: 'geo', version: '0.7.7')
api(group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.19.0')
api(group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1')
api(group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2')
- api(group: 'com.google.guava', name: 'guava', version: '28.1-jre')
+ api(group: 'com.google.guava', name: 'guava', version: '28.2-jre')
api(group: 'com.google.protobuf', name: 'protobuf-gradle-plugin', version: get('protobuf-gradle-plugin.version'))
api(group: 'com.google.protobuf', name: 'protobuf-java', version: get('protobuf-java.version'))
api(group: 'com.healthmarketscience.rmiio', name: 'rmiio', version: '2.1.2')
- api(group: 'com.mockrunner', name: 'mockrunner-servlet', version: '2.0.1')
+ api(group: 'com.mockrunner', name: 'mockrunner-servlet', version: '2.0.4')
api(group: 'com.nimbusds', name:'nimbus-jose-jwt', version:'8.11')
api(group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0')
- api(group: 'com.sun.istack', name: 'istack-commons-runtime', version: '3.0.9')
+ api(group: 'com.sun.istack', name: 'istack-commons-runtime', version: '3.0.11')
api(group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.2')
api(group: 'com.tngtech.archunit', name:'archunit-junit4', version: '0.12.0')
- api(group: 'com.zaxxer', name: 'HikariCP', version: '3.4.1')
+ api(group: 'com.zaxxer', name: 'HikariCP', version: '3.4.2')
api(group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4')
api(group: 'commons-codec', name: 'commons-codec', version: '1.14')
api(group: 'commons-collections', name: 'commons-collections', version: '3.2.2')
@@ -114,7 +114,7 @@ class DependencyConstraints implements Plugin<Project> {
api(group: 'commons-logging', name: 'commons-logging', version: '1.2')
api(group: 'commons-modeler', name: 'commons-modeler', version: '2.0.1')
api(group: 'commons-validator', name: 'commons-validator', version: get('commons-validator.version'))
- api(group: 'io.github.classgraph', name: 'classgraph', version: '4.8.52')
+ api(group: 'io.github.classgraph', name: 'classgraph', version: '4.8.68')
api(group: 'io.micrometer', name: 'micrometer-core', version: get('micrometer.version'))
api(group: 'io.netty', name: 'netty-all', version: '4.1.48.Final')
api(group: 'io.swagger', name: 'swagger-annotations', version: '1.5.23')
@@ -132,22 +132,22 @@ class DependencyConstraints implements Plugin<Project> {
api(group: 'mysql', name: 'mysql-connector-java', version: '5.1.46')
api(group: 'net.java.dev.jna', name: 'jna', version: '5.5.0')
api(group: 'net.java.dev.jna', name: 'jna-platform', version: '5.5.0')
- api(group: 'net.openhft', name: 'compiler', version: '2.3.4')
+ api(group: 'net.openhft', name: 'compiler', version: '2.3.5')
api(group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4')
- api(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.20.0')
- api(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.20.0')
+ api(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.22.0')
+ api(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.22.0')
api(group: 'net.spy', name: 'spymemcached', version: '2.12.3')
- api(group: 'org.apache.bcel', name: 'bcel', version: '6.2')
+ api(group: 'org.apache.bcel', name: 'bcel', version: '6.4.1')
api(group: 'org.apache.commons', name: 'commons-lang3', version: get('commons-lang3.version'))
api(group: 'org.apache.commons', name: 'commons-text', version: 1.8)
api(group: 'org.apache.derby', name: 'derby', version: '10.14.2.0')
- api(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.10')
- api(group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.12')
+ api(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.12')
+ api(group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.13')
api(group: 'org.apache.shiro', name: 'shiro-core', version: get('shiro.version'))
- api(group: 'org.assertj', name: 'assertj-core', version: '3.13.2')
- api(group: 'org.awaitility', name: 'awaitility', version: '3.1.6')
- api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.63')
- api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.7.7')
+ api(group: 'org.assertj', name: 'assertj-core', version: '3.15.0')
+ api(group: 'org.awaitility', name: 'awaitility', version: '4.0.2')
+ api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.64')
+ api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.7.11')
api(group: 'org.eclipse.jetty', name: 'jetty-server', version: get('jetty.version'))
api(group: 'org.eclipse.jetty', name: 'jetty-webapp', version: get('jetty.version'))
api(group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.2.1')
@@ -156,7 +156,7 @@ class DependencyConstraints implements Plugin<Project> {
api(group: 'org.jgroups', name: 'jgroups', version: get('jgroups.version'))
api(group: 'org.mockito', name: 'mockito-core', version: '2.23.0')
api(group: 'org.mortbay.jetty', name: 'servlet-api', version: '3.0.20100224')
- api(group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.21')
+ api(group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.23')
api(group: 'org.postgresql', name: 'postgresql', version: '42.2.8')
api(group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0')
api(group: 'org.slf4j', name: 'slf4j-api', version: get('slf4j-api.version'))
@@ -170,7 +170,7 @@ class DependencyConstraints implements Plugin<Project> {
}
}
- dependencySet(group: 'com.fasterxml.jackson.core', version: '2.10.0') {
+ dependencySet(group: 'com.fasterxml.jackson.core', version: '2.10.1') {
entry('jackson-annotations')
entry('jackson-core')
entry('jackson-databind')
@@ -186,7 +186,7 @@ class DependencyConstraints implements Plugin<Project> {
entry('docker-compose-rule-junit4')
}
- dependencySet(group: 'com.pholser', version: '0.9') {
+ dependencySet(group: 'com.pholser', version: '0.9.1') {
entry('junit-quickcheck-core')
entry('junit-quickcheck-generators')
}
@@ -236,7 +236,7 @@ class DependencyConstraints implements Plugin<Project> {
entry('selenium-support')
}
- dependencySet(group: 'org.springframework.security', version: '5.2.3.RELEASE') {
+ dependencySet(group: 'org.springframework.security', version: '5.3.1.RELEASE') {
entry('spring-security-config')
entry('spring-security-core')
entry('spring-security-ldap')
diff --git a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java
index a7da1ff..90eeaa5 100644
--- a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java
+++ b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java
@@ -41,8 +41,8 @@ public class TomcatInstall extends ContainerInstall {
*/
public enum TomcatVersion {
TOMCAT6(6, "tomcat-6.0.37.zip"),
- TOMCAT7(7, "tomcat-7.0.96.zip"),
- TOMCAT8(8, "tomcat-8.5.46.zip"),
+ TOMCAT7(7, "tomcat-7.0.99.zip"),
+ TOMCAT8(8, "tomcat-8.5.50.zip"),
TOMCAT9(9, "tomcat-9.0.12.zip");
private final int version;
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/cache/persistence/MissingDiskStoreAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/cache/persistence/MissingDiskStoreAcceptanceTest.java
index 25302ae..d946cb2 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/cache/persistence/MissingDiskStoreAcceptanceTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/cache/persistence/MissingDiskStoreAcceptanceTest.java
@@ -148,6 +148,6 @@ public class MissingDiskStoreAcceptanceTest {
gfshRule.execute(connectToLocatorCommand, startServer2Command);
- startServer1.get(getTimeout().getValueInMS(), MILLISECONDS);
+ startServer1.get(getTimeout().toMillis(), MILLISECONDS);
}
}
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/rest/StandaloneClientManagementAPIAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/rest/StandaloneClientManagementAPIAcceptanceTest.java
index 6cdc9fc..10ff055 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/rest/StandaloneClientManagementAPIAcceptanceTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/rest/StandaloneClientManagementAPIAcceptanceTest.java
@@ -87,7 +87,7 @@ public class StandaloneClientManagementAPIAcceptanceTest {
@After
public void tearDown() throws Exception {
- clientProcessLogger.awaitTermination(GeodeAwaitility.getTimeout().getValueInMS(), MILLISECONDS);
+ clientProcessLogger.awaitTermination(GeodeAwaitility.getTimeout().toMillis(), MILLISECONDS);
clientProcessLogger.close();
}
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 9ed45ef..02e01d0 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -963,24 +963,23 @@ javadoc/package-list
javadoc/script.js
javadoc/serialized-form.html
javadoc/stylesheet.css
-lib/HdrHistogram-2.1.11.jar
-lib/HikariCP-3.4.1.jar
+lib/HdrHistogram-2.1.12.jar
+lib/HikariCP-3.4.2.jar
lib/LatencyUtils-2.0.3.jar
lib/antlr-2.7.7.jar
-lib/classgraph-4.8.52.jar
+lib/classgraph-4.8.68.jar
lib/commons-beanutils-1.9.4.jar
lib/commons-codec-1.14.jar
lib/commons-collections-3.2.2.jar
lib/commons-digester-2.1.jar
lib/commons-io-2.6.jar
-lib/commons-lang3-3.9.jar
+lib/commons-lang3-3.10.jar
lib/commons-logging-1.2.jar
-lib/commons-math3-3.2.jar
lib/commons-modeler-2.0.1.jar
lib/commons-validator-1.6.jar
-lib/fastutil-8.3.0.jar
+lib/fastutil-8.3.1.jar
lib/findbugs-annotations-1.3.9-1.jar
-lib/geo-0.7.1.jar
+lib/geo-0.7.7.jar
lib/geode-common-0.0.0.jar
lib/geode-connectors-0.0.0.jar
lib/geode-core-0.0.0.jar
@@ -1005,13 +1004,12 @@ lib/geode-tcp-server-0.0.0.jar
lib/geode-unsafe-0.0.0.jar
lib/geode-wan-0.0.0.jar
lib/gfsh-dependencies.jar
-lib/grumpy-core-0.2.2.jar
-lib/httpclient-4.5.10.jar
-lib/httpcore-4.4.12.jar
-lib/istack-commons-runtime-3.0.9.jar
-lib/jackson-annotations-2.10.0.jar
-lib/jackson-core-2.10.0.jar
-lib/jackson-databind-2.10.0.jar
+lib/httpclient-4.5.12.jar
+lib/httpcore-4.4.13.jar
+lib/istack-commons-runtime-3.0.11.jar
+lib/jackson-annotations-2.10.1.jar
+lib/jackson-core-2.10.1.jar
+lib/jackson-databind-2.10.1.jar
lib/javax.activation-1.2.0.jar
lib/javax.activation-api-1.2.0.jar
lib/javax.mail-api-1.6.2.jar
@@ -1033,22 +1031,22 @@ lib/jline-2.12.jar
lib/jna-5.5.0.jar
lib/jna-platform-5.5.0.jar
lib/jopt-simple-5.0.4.jar
-lib/log4j-api-2.12.1.jar
-lib/log4j-core-2.12.1.jar
-lib/log4j-jcl-2.12.1.jar
-lib/log4j-jul-2.12.1.jar
-lib/log4j-slf4j-impl-2.12.1.jar
+lib/log4j-api-2.13.1.jar
+lib/log4j-core-2.13.1.jar
+lib/log4j-jcl-2.13.1.jar
+lib/log4j-jul-2.13.1.jar
+lib/log4j-slf4j-impl-2.13.1.jar
lib/lucene-analyzers-common-6.6.6.jar
lib/lucene-analyzers-phonetic-6.6.6.jar
lib/lucene-core-6.6.6.jar
lib/lucene-queries-6.6.6.jar
lib/lucene-queryparser-6.6.6.jar
-lib/micrometer-core-1.2.1.jar
+lib/micrometer-core-1.4.1.jar
lib/mx4j-3.0.2.jar
lib/mx4j-remote-3.0.2.jar
lib/mx4j-tools-3.0.1.jar
lib/netty-all-4.1.48.Final.jar
-lib/protobuf-java-3.10.0.jar
+lib/protobuf-java-3.11.4.jar
lib/ra.jar
lib/rmiio-2.1.2.jar
lib/shiro-cache-1.5.2.jar
@@ -1060,7 +1058,7 @@ lib/shiro-crypto-core-1.5.2.jar
lib/shiro-crypto-hash-1.5.2.jar
lib/shiro-event-1.5.2.jar
lib/shiro-lang-1.5.2.jar
-lib/slf4j-api-1.7.28.jar
+lib/slf4j-api-1.7.30.jar
lib/snappy-0.4.jar
lib/spring-beans-5.2.5.RELEASE.jar
lib/spring-context-5.2.5.RELEASE.jar
diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index 004d98d..588f3c4 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -5,7 +5,6 @@ geode-cq-0.0.0.jar
geode-gfsh-0.0.0.jar
geode-log4j-0.0.0.jar
geode-logging-0.0.0.jar
-geode-membership-0.0.0.jar
geode-lucene-0.0.0.jar
geode-management-0.0.0.jar
geode-memcached-0.0.0.jar
@@ -17,43 +16,46 @@ geode-redis-0.0.0.jar
geode-serialization-0.0.0.jar
geode-tcp-server-0.0.0.jar
geode-wan-0.0.0.jar
-jackson-databind-2.10.0.jar
-jackson-annotations-2.10.0.jar
-jackson-core-2.10.0.jar
+jackson-databind-2.10.1.jar
+jackson-annotations-2.10.1.jar
+jackson-core-2.10.1.jar
+geode-membership-0.0.0.jar
geode-http-service-0.0.0.jar
geode-unsafe-0.0.0.jar
-HikariCP-3.4.1.jar
-commons-lang3-3.9.jar
+httpclient-4.5.12.jar
+httpcore-4.4.13.jar
+HikariCP-3.4.2.jar
+commons-lang3-3.10.jar
jaxb-api-2.3.1.jar
-log4j-jcl-2.12.1.jar
-log4j-api-2.12.1.jar
+log4j-jcl-2.13.1.jar
+log4j-api-2.13.1.jar
spring-shell-1.2.0.RELEASE.jar
rmiio-2.1.2.jar
-jaxb-impl-2.3.2.jar
antlr-2.7.7.jar
javax.activation-1.2.0.jar
-istack-commons-runtime-3.0.9.jar
+istack-commons-runtime-3.0.11.jar
+jaxb-impl-2.3.2.jar
commons-validator-1.6.jar
shiro-core-1.5.2.jar
shiro-config-ogdl-1.5.2.jar
commons-beanutils-1.9.4.jar
+commons-codec-1.14.jar
commons-collections-3.2.2.jar
commons-io-2.6.jar
-httpclient-4.5.10.jar
commons-logging-1.2.jar
-classgraph-4.8.52.jar
-micrometer-core-1.2.1.jar
-fastutil-8.3.0.jar
+classgraph-4.8.68.jar
+micrometer-core-1.4.1.jar
+swagger-annotations-1.5.23.jar
+fastutil-8.3.1.jar
javax.resource-api-1.7.1.jar
jetty-webapp-9.4.21.v20190926.jar
jetty-servlet-9.4.21.v20190926.jar
jetty-security-9.4.21.v20190926.jar
jetty-server-9.4.21.v20190926.jar
javax.servlet-api-3.1.0.jar
-jna-5.5.0.jar
jna-platform-5.5.0.jar
+jna-5.5.0.jar
jopt-simple-5.0.4.jar
-httpcore-4.4.12.jar
snappy-0.4.jar
jgroups-3.6.14.Final.jar
shiro-cache-1.5.2.jar
@@ -63,30 +65,26 @@ shiro-config-core-1.5.2.jar
shiro-event-1.5.2.jar
shiro-crypto-core-1.5.2.jar
shiro-lang-1.5.2.jar
-slf4j-api-1.7.28.jar
-swagger-annotations-1.5.23.jar
+slf4j-api-1.7.30.jar
spring-core-5.2.5.RELEASE.jar
javax.activation-api-1.2.0.jar
jline-2.12.jar
-HdrHistogram-2.1.11.jar
+HdrHistogram-2.1.12.jar
LatencyUtils-2.0.3.jar
javax.transaction-api-1.3.jar
spring-jcl-5.2.5.RELEASE.jar
-commons-codec-1.14.jar
-jetty-xml-9.4.21.v20190926.jar
jetty-http-9.4.21.v20190926.jar
jetty-io-9.4.21.v20190926.jar
+jetty-xml-9.4.21.v20190926.jar
jetty-util-9.4.21.v20190926.jar
-log4j-slf4j-impl-2.12.1.jar
-log4j-core-2.12.1.jar
-log4j-jul-2.12.1.jar
+log4j-slf4j-impl-2.13.1.jar
+log4j-core-2.13.1.jar
+log4j-jul-2.13.1.jar
lucene-analyzers-phonetic-6.6.6.jar
lucene-analyzers-common-6.6.6.jar
lucene-queryparser-6.6.6.jar
lucene-core-6.6.6.jar
lucene-queries-6.6.6.jar
-protobuf-java-3.10.0.jar
-geo-0.7.1.jar
+protobuf-java-3.11.4.jar
+geo-0.7.7.jar
netty-all-4.1.48.Final.jar
-grumpy-core-0.2.2.jar
-commons-math3-3.2.jar
diff --git a/geode-assembly/src/integrationTest/resources/expected_jars.txt b/geode-assembly/src/integrationTest/resources/expected_jars.txt
index f09f6d7..c116f7c 100644
--- a/geode-assembly/src/integrationTest/resources/expected_jars.txt
+++ b/geode-assembly/src/integrationTest/resources/expected_jars.txt
@@ -2,7 +2,7 @@ HdrHistogram
HikariCP
LatencyUtils
accessors-smart
-animal-sniffer-annotations
+activation
antlr
asm
byte-buddy
@@ -17,17 +17,16 @@ commons-fileupload
commons-io
commons-lang
commons-logging
-commons-math
commons-modeler
commons-text
commons-validator
+content-type
error_prone_annotations
failureaccess
fastutil
findbugs-annotations
geo
gfsh-dependencies.jar
-grumpy-core
guava
httpclient
httpcore
@@ -38,12 +37,14 @@ jackson-core
jackson-databind
javax.activation
javax.activation-api
+javax.mail
javax.mail-api
javax.resource-api
javax.servlet-api
javax.transaction-api
jaxb-api
jaxb-impl
+jcip-annotations
jetty-http
jetty-io
jetty-security
@@ -60,6 +61,7 @@ jopt-simple
json-path
json-smart
jsr
+lang-tag
listenablefuture
log4j-api
log4j-core
@@ -77,6 +79,8 @@ mx4j
mx4j-remote
mx4j-tools
netty-all
+nimbus-jose-jwt
+oauth2-oidc-sdk
protobuf-java
ra.jar
rmiio
@@ -106,6 +110,9 @@ spring-plugin-metadata
spring-security-config
spring-security-core
spring-security-ldap
+spring-security-oauth2-client
+spring-security-oauth2-core
+spring-security-oauth2-jose
spring-security-web
spring-shell
spring-tx
@@ -120,12 +127,3 @@ springfox-swagger-common
springfox-swagger-ui
swagger-annotations
swagger-models
-activation
-javax.mail
-jcip-annotations
-lang-tag
-nimbus-jose-jwt
-oauth2-oidc-sdk
-spring-security-oauth2-client
-spring-security-oauth2-core
-spring-security-oauth2-jose
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
index 492ec3a..3ae79fd 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
@@ -219,7 +219,7 @@ public class ClusterCommunicationsDUnitTest implements Serializable {
// System.setProperty("javax.net.debug", "all");
Properties props = getDistributedSystemProperties();
// locator must restart with the same port so that it reconnects to the server
- await().atMost(getTimeout().getValueInMS(), TimeUnit.MILLISECONDS)
+ await().atMost(getTimeout().toMillis(), TimeUnit.MILLISECONDS)
.until(() -> Locator.startLocatorAndDS(locatorPort, new File(""), props) != null);
assertThat(Locator.getLocator().getDistributedSystem().getAllOtherMembers().size())
.isGreaterThan(0);
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/alerting/internal/api/AlertingServiceDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/alerting/internal/api/AlertingServiceDistributedTest.java
index b1eacc8..71c734f 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/alerting/internal/api/AlertingServiceDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/alerting/internal/api/AlertingServiceDistributedTest.java
@@ -80,7 +80,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@Category({AlertingTest.class, ManagementTest.class})
public class AlertingServiceDistributedTest implements Serializable {
- private static final long TIMEOUT = getTimeout().getValueInMS();
+ private static final long TIMEOUT = getTimeout().toMillis();
private static final NotificationFilter SYSTEM_ALERT_FILTER =
notification -> notification.getType().equals(SYSTEM_ALERT);
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
index 2018d80..6f03fa0 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
@@ -1057,7 +1057,7 @@ public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCa
switch (spot) {
case BEFORE_QUERY_EXECUTION:
try {
- if (!latch.await(GeodeAwaitility.getTimeout().getValueInMS(), MILLISECONDS)) {
+ if (!latch.await(GeodeAwaitility.getTimeout().toMillis(), MILLISECONDS)) {
fail("doTestHook: query was not unlatched in time");
}
} catch (InterruptedException e) {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
index e07b17d..47cb6da 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
@@ -405,7 +405,7 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase {
System.out.println("ds.isReconnecting() = " + ds.isReconnecting());
boolean failure = true;
try {
- ds.waitUntilReconnected(getTimeout().getValueInMS(), MILLISECONDS);
+ ds.waitUntilReconnected(getTimeout().toMillis(), MILLISECONDS);
savedSystem = ds.getReconnectedSystem();
locator = (InternalLocator) getLocator();
assertTrue("Expected system to be restarted", ds.getReconnectedSystem() != null);
@@ -1157,7 +1157,7 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase {
return "waiting for cache to begin reconnecting";
}
});
- assertThatThrownBy(() -> cache.waitUntilReconnected(getTimeout().getValueInMS(), MILLISECONDS))
+ assertThatThrownBy(() -> cache.waitUntilReconnected(getTimeout().toMillis(), MILLISECONDS))
.isInstanceOf(CacheClosedException.class)
.hasMessageContaining("Cache could not be recreated")
.hasCauseExactlyInstanceOf(DistributedSystemDisconnectedException.class);
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithClusterConfigurationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithClusterConfigurationDUnitTest.java
index 6a7c262..d2c6d95 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithClusterConfigurationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithClusterConfigurationDUnitTest.java
@@ -175,7 +175,7 @@ public class ReconnectWithClusterConfigurationDUnitTest implements Serializable
AsyncInvocation[] waiters = new AsyncInvocation[NUM_VMS];
for (int i = NUM_VMS - 1; i >= 0; i--) {
waiters[i] = VM.getVM(i).invokeAsync("wait for reconnect", () -> {
- system.waitUntilReconnected(GeodeAwaitility.getTimeout().getValueInMS(),
+ system.waitUntilReconnected(GeodeAwaitility.getTimeout().toMillis(),
TimeUnit.MILLISECONDS);
system = system.getReconnectedSystem();
cache = cache.getReconnectedCache();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
index 4bf472b..2a01cd6 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -290,7 +290,7 @@ public class LocatorDUnitTest implements Serializable {
try {
for (int i = 0; i < 4; i++) {
forceDisconnect();
- system.waitUntilReconnected(GeodeAwaitility.getTimeout().getValueInMS(), MILLISECONDS);
+ system.waitUntilReconnected(GeodeAwaitility.getTimeout().toMillis(), MILLISECONDS);
assertThat(system.getReconnectedSystem()).isNotNull();
system = (InternalDistributedSystem) system.getReconnectedSystem();
}
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
index 2972a30..43ec10c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
@@ -137,6 +137,6 @@ public class DistributionAdvisorDUnitTest extends DistributedTestCase {
verify(logger, atLeastOnce()).info("Wait for current operations completed");
});
- waitForCurrentOperations.get(getTimeout().getValueInMS(), MILLISECONDS);
+ waitForCurrentOperations.get(getTimeout().toMillis(), MILLISECONDS);
}
}
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerReadConflictTransactionDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerReadConflictTransactionDistributedTest.java
index 29114a0..1fec401 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerReadConflictTransactionDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerReadConflictTransactionDistributedTest.java
@@ -63,7 +63,7 @@ public class ClientServerReadConflictTransactionDistributedTest implements Seria
private static final String value3 = "value3";
private static final String newValue1 = "newValue1";
private static final String newValue3 = "newValue3";
- private static final long TIMEOUT_MILLIS = getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = getTimeout().toMillis();
private static final String allowReadTransactionCommitToProceed =
"allowReadTransactionCommitToProceed";
private static final String allowSecondTransactionToProceed = "allowSecondTransactionToProceed";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverDistributedTest.java
index 3ffc4ee..393acb6 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverDistributedTest.java
@@ -149,7 +149,7 @@ public class ClientServerTransactionFailoverDistributedTest implements Serializa
// set longer than GeodeAwaitility.DEFAULT_TIMEOUT to avoid GII triggered by
// region synchronize with.
// This ensures the commit is brought into replicas by the CommitProcessQueryMessage.
- server.setMaximumTimeBetweenPings((int) GeodeAwaitility.getTimeout().getValueInMS() + 60000);
+ server.setMaximumTimeBetweenPings((int) GeodeAwaitility.getTimeout().toMillis() + 60000);
}
server.start();
return server.getPort();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
index 598541d..1b0efdb 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
@@ -1010,7 +1010,7 @@ public class DeltaPropagationDUnitTest implements Serializable {
clientVM.invoke(() -> {
// Step 5
- LATCH.get().await(getTimeout().getValueInMS(), MILLISECONDS);
+ LATCH.get().await(getTimeout().toMillis(), MILLISECONDS);
// Step 6
new ClientFactory().create(new ClientCacheFactory(clientProperties));
@@ -1627,7 +1627,7 @@ public class DeltaPropagationDUnitTest implements Serializable {
@Override
public void run() {
try {
- LATCH.get().await(getTimeout().getValueInMS(), MILLISECONDS);
+ LATCH.get().await(getTimeout().toMillis(), MILLISECONDS);
} catch (InterruptedException ignore) {
// ignored
}
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
index 4ecba96..943c503 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
@@ -617,7 +617,7 @@ public class PartitionedRegionSingleHopDUnitTest implements Serializable {
vm0.invoke(() -> stopServer());
vm1.invoke(() -> stopServer());
- LATCH.get().await(getTimeout().getValueInMS(), MILLISECONDS);
+ LATCH.get().await(getTimeout().toMillis(), MILLISECONDS);
doGets();
@@ -952,7 +952,7 @@ public class PartitionedRegionSingleHopDUnitTest implements Serializable {
});
}
- LATCH.get().await(getTimeout().getValueInMS(), MILLISECONDS);
+ LATCH.get().await(getTimeout().toMillis(), MILLISECONDS);
AsyncInvocation<Integer> createServerOnVM3 =
vm3.invokeAsync(() -> createServer("disk", -1, 3, 4));
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDistributedTest.java
index 94bd61c..7f43087 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDistributedTest.java
@@ -122,7 +122,7 @@ import org.apache.geode.util.internal.GeodeGlossary;
@SuppressWarnings("serial")
public class RebalanceOperationDistributedTest extends CacheTestCase {
- private static final long TIMEOUT_SECONDS = GeodeAwaitility.getTimeout().getValue();
+ private static final long TIMEOUT_SECONDS = GeodeAwaitility.getTimeout().getSeconds();
@Rule
public DistributedRestoreSystemProperties restoreSystemProperties =
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
index b90f25b..b95a68b 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
@@ -260,7 +260,7 @@ public class DistributedRegionFunctionExecutionDUnitTest implements Serializable
ResultCollector<String, List<String>> resultCollector = FunctionServiceCast
.<Void, String, List<String>>onRegion(getRegion())
.withFilter(filter)
- .execute(LongRunningFunction.class.getSimpleName(), getTimeout().getValueInMS(),
+ .execute(LongRunningFunction.class.getSimpleName(), getTimeout().toMillis(),
MILLISECONDS);
assertThat(resultCollector.getResult().get(0))
@@ -645,7 +645,7 @@ public class DistributedRegionFunctionExecutionDUnitTest implements Serializable
});
client.invoke(() -> {
- LATCH.get().await(getTimeout().getValueInMS(), MILLISECONDS);
+ LATCH.get().await(getTimeout().toMillis(), MILLISECONDS);
});
emptyServer1.invoke(() -> closeCacheHA());
@@ -1469,7 +1469,7 @@ public class DistributedRegionFunctionExecutionDUnitTest implements Serializable
@Override
public void execute(FunctionContext<Void> context) {
try {
- latch.await(getTimeout().getValueInMS(), MILLISECONDS);
+ latch.await(getTimeout().toMillis(), MILLISECONDS);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDistributedTest.java
index 5b53ae3..3ae358c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDistributedTest.java
@@ -109,7 +109,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolde
@SuppressWarnings("serial")
public class PersistentColocatedPartitionedRegionDistributedTest implements Serializable {
- private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().toMillis();
private static final long DEFAULT_RECOVERY_DELAY = -1;
private static final int DEFAULT_REDUNDANT_COPIES = 0;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionHangsDuringRestartRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionHangsDuringRestartRegressionTest.java
index 8647e84..0123857 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionHangsDuringRestartRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionHangsDuringRestartRegressionTest.java
@@ -66,7 +66,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@SuppressWarnings("serial,unused")
public class PersistentPartitionHangsDuringRestartRegressionTest implements Serializable {
- private static final long TIMEOUT_MILLIS = getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = getTimeout().toMillis();
/** WAIT_TO_BOUNCE latch is never counted down -- it prevents responding to RequestImageMessage */
private static final CountDownLatch WAIT_TO_BOUNCE = new CountDownLatch(99);
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
index c8132bb..63f092e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
@@ -125,7 +125,7 @@ public class PersistentPartitionedRegionDistributedTest implements Serializable
private VM vm2;
private VM vm3;
- private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().toMillis();
@Rule
public DistributedRule distributedRule = new DistributedRule();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
index 9ccf33b..6fb4c97 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
@@ -93,7 +93,7 @@ import org.apache.geode.test.junit.categories.PersistenceTest;
public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase {
private static final int TEST_REPLICATED_TOMBSTONE_TIMEOUT = 1_000;
- private static final long TIMEOUT_MILLIS = getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = getTimeout().toMillis();
@Rule
public DistributedRestoreSystemProperties restoreSystemProperties =
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
index f51158a..a256054 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
@@ -113,7 +113,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolde
@SuppressWarnings("serial")
public class PersistentRecoveryOrderDUnitTest extends CacheTestCase {
- private static final long TIMEOUT_MILLIS = getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = getTimeout().toMillis();
private static final AtomicBoolean SAW_REQUEST_IMAGE_MESSAGE = new AtomicBoolean();
private static final AtomicReference<CountDownLatch> LATCH = new AtomicReference<>();
private static final AtomicReference<CountDownLatch> SLEEP = new AtomicReference<>();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
index d7e1439..63e0f0e 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
@@ -70,7 +70,7 @@ import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
@Category({ClientSubscriptionTest.class})
public class RedundancyLevelPart1DUnitTest implements Serializable {
- private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().toMillis();
private static final String K1 = "k1";
private static final String K2 = "k2";
private static final String REGION_NAME = "RedundancyLevelTestBase_region";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
index 9ae2f9d..92885e4 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
@@ -71,7 +71,7 @@ import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
@Category({ClientSubscriptionTest.class})
public class RedundancyLevelPart3DUnitTest implements Serializable {
- private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().toMillis();
private static final String K1 = "k1";
private static final String K2 = "k2";
private static final String REGION_NAME = "RedundancyLevelTestBase_region";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/metrics/MeterSubregistryReconnectDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/metrics/MeterSubregistryReconnectDistributedTest.java
index a1311c6..237db35 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/metrics/MeterSubregistryReconnectDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/metrics/MeterSubregistryReconnectDistributedTest.java
@@ -55,7 +55,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolde
public class MeterSubregistryReconnectDistributedTest implements Serializable {
- private static final long TIMEOUT = getTimeout().getValueInMS();
+ private static final long TIMEOUT = getTimeout().toMillis();
private static LocatorLauncher locatorLauncher;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/logging/internal/LoggingWithReconnectDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/logging/internal/LoggingWithReconnectDistributedTest.java
index c61b72d..7bde3cc 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/logging/internal/LoggingWithReconnectDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/logging/internal/LoggingWithReconnectDistributedTest.java
@@ -63,7 +63,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@Category(LoggingTest.class)
public class LoggingWithReconnectDistributedTest implements Serializable {
- private static final long TIMEOUT = getTimeout().getValueInMS();
+ private static final long TIMEOUT = getTimeout().toMillis();
private static LocatorLauncher locatorLauncher;
private static ServerLauncher serverLauncher;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithAlertsDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithAlertsDistributedTest.java
index 8aa3ada..888c404 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithAlertsDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithAlertsDistributedTest.java
@@ -88,7 +88,7 @@ public class DistributedSystemMXBeanWithAlertsDistributedTest implements Seriali
private static final String MANAGER_NAME = "managerVM";
private static final String MEMBER_NAME = "memberVM-";
- private static final long TIMEOUT = getTimeout().getValueInMS();
+ private static final long TIMEOUT = getTimeout().toMillis();
private static final NotificationFilter SYSTEM_ALERT_FILTER =
notification -> notification.getType().equals(SYSTEM_ALERT);
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithNotificationsDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithNotificationsDistributedTest.java
index 7505abf..5fedea4 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithNotificationsDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithNotificationsDistributedTest.java
@@ -82,7 +82,7 @@ import org.apache.geode.test.junit.categories.ManagementTest;
@SuppressWarnings("serial")
public class DistributedSystemMXBeanWithNotificationsDistributedTest implements Serializable {
- private static final long TIMEOUT = getTimeout().getValueInMS();
+ private static final long TIMEOUT = getTimeout().toMillis();
private static final String MANAGER_NAME = "managerVM";
private static final String MEMBER_NAME = "memberVM-";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java
index ad591ac..bc49a86 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java
@@ -82,7 +82,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolde
@SuppressWarnings("serial")
public class JMXMBeanReconnectDUnitTest implements Serializable {
- private static final long TIMEOUT_MILLIS = getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = getTimeout().toMillis();
private static final LocatorLauncher DUMMY_LOCATOR = mock(LocatorLauncher.class);
private static final ServerLauncher DUMMY_SERVER = mock(ServerLauncher.class);
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java
index b7c80dc..13695e2 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java
@@ -48,7 +48,7 @@ import org.apache.geode.test.process.ProcessWrapper;
public class DeprecatedAgentLauncherIntegrationTest {
- private static final long TIMEOUT = getTimeout().getValueInMS();
+ private static final long TIMEOUT = getTimeout().toMillis();
private String classpath;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/alerting/internal/api/AlertingServiceWithClusterIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/alerting/internal/api/AlertingServiceWithClusterIntegrationTest.java
index 258654f..5e92e29 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/alerting/internal/api/AlertingServiceWithClusterIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/alerting/internal/api/AlertingServiceWithClusterIntegrationTest.java
@@ -59,7 +59,7 @@ import org.apache.geode.test.junit.categories.AlertingTest;
@Category(AlertingTest.class)
public class AlertingServiceWithClusterIntegrationTest {
- private static final long TIMEOUT = getTimeout().getValueInMS();
+ private static final long TIMEOUT = getTimeout().toMillis();
private InternalDistributedSystem system;
private DistributedMember member;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java
index 6787ac7..b571886 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java
@@ -63,7 +63,7 @@ import org.apache.geode.util.internal.GeodeGlossary;
*/
public abstract class LauncherIntegrationTestCase {
- protected static final long AWAIT_MILLIS = getTimeout().getValueInMS() * 2;
+ protected static final long AWAIT_MILLIS = getTimeout().toMillis() * 2;
private static final int PREFERRED_FAKE_PID = 42;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java
index a8a3873..c8b9d7f 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java
@@ -48,7 +48,7 @@ import org.apache.geode.test.awaitility.GeodeAwaitility;
public abstract class ServerLauncherRemoteIntegrationTestCase
extends ServerLauncherIntegrationTestCase implements UsesServerCommand {
- private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().toMillis();
private final AtomicBoolean threwBindException = new AtomicBoolean();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
index 3a26b40..412ffd1 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
@@ -79,7 +79,7 @@ public class PartitionedRegionCreationJUnitTest {
int numAlive = 0;
for (Thread thread : regionCreationThreads) {
thread.interrupt();
- thread.join(GeodeAwaitility.getTimeout().getValueInMS() / numThreads);
+ thread.join(GeodeAwaitility.getTimeout().toMillis() / numThreads);
if (thread.isAlive()) {
numAlive++;
}
@@ -322,7 +322,7 @@ public class PartitionedRegionCreationJUnitTest {
if (PRCreateDone)
return;
int numthread = 0;
- long giveupTime = System.currentTimeMillis() + GeodeAwaitility.getTimeout().getValueInMS();
+ long giveupTime = System.currentTimeMillis() + GeodeAwaitility.getTimeout().toMillis();
while (numthread < TOTAL_THREADS && giveupTime > System.currentTimeMillis()) {
PartionedRegionCreateThread pregionThread = new PartionedRegionCreateThread();
pregionThread.start();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TXDetectReadConflictJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TXDetectReadConflictJUnitTest.java
index 747b525..da725c7 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TXDetectReadConflictJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TXDetectReadConflictJUnitTest.java
@@ -147,7 +147,7 @@ public class TXDetectReadConflictJUnitTest {
private void readTransactionAfterReservation() {
allowWriteTransactionToCommitLatch.countDown();
try {
- allowReadTransactionToProceedLatch.await(GeodeAwaitility.getTimeout().getValueInMS(),
+ allowReadTransactionToProceedLatch.await(GeodeAwaitility.getTimeout().toMillis(),
TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
throw new RuntimeException(e);
@@ -158,7 +158,7 @@ public class TXDetectReadConflictJUnitTest {
TXManagerImpl txManager = (TXManagerImpl) cache.getCacheTransactionManager();
txManager.begin();
region.put(key, newValue); // expect commit conflict
- allowWriteTransactionToCommitLatch.await(GeodeAwaitility.getTimeout().getValueInMS(),
+ allowWriteTransactionToCommitLatch.await(GeodeAwaitility.getTimeout().toMillis(),
TimeUnit.MILLISECONDS);
assertThatThrownBy(() -> txManager.commit()).isExactlyInstanceOf(CommitConflictException.class);
allowReadTransactionToProceedLatch.countDown();
@@ -214,7 +214,7 @@ public class TXDetectReadConflictJUnitTest {
private void putTransactionAfterReservation() {
allowReadTransactionToProceedLatch.countDown();
try {
- allowWriteTransactionToCommitLatch.await(GeodeAwaitility.getTimeout().getValueInMS(),
+ allowWriteTransactionToCommitLatch.await(GeodeAwaitility.getTimeout().toMillis(),
TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
throw new RuntimeException(e);
@@ -226,7 +226,7 @@ public class TXDetectReadConflictJUnitTest {
txManager.begin();
assertEquals(regionPR.get(key1), value1);
try {
- allowReadTransactionToProceedLatch.await(GeodeAwaitility.getTimeout().getValueInMS(),
+ allowReadTransactionToProceedLatch.await(GeodeAwaitility.getTimeout().toMillis(),
TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
throw new RuntimeException(e);
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/IncrementalBackupIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/IncrementalBackupIntegrationTest.java
index 6b68075..548eb2d 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/IncrementalBackupIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/IncrementalBackupIntegrationTest.java
@@ -74,7 +74,7 @@ import org.apache.geode.test.junit.rules.DiskDirRule;
public class IncrementalBackupIntegrationTest {
private static final Logger logger = LogService.getLogger();
- private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().toMillis();
private static final int DATA_INCREMENT = 10_000;
private static final IOFileFilter OPLOG_FILTER = new RegexFileFilter(".*\\.[kdc]rf$");
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
index ecf87c4..10ad070 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
@@ -26,11 +26,10 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.time.Duration;
import java.util.Map;
import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-import org.awaitility.Duration;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -79,8 +78,8 @@ public class ConnectionProxyJUnitTest {
SequenceIdAndExpirationObject seo = null;
- final Duration timeoutToVerifyExpiry = new Duration(30, TimeUnit.SECONDS);
- final Duration timeoutToVerifyAckSend = new Duration(30, TimeUnit.SECONDS);
+ final Duration timeoutToVerifyExpiry = Duration.ofSeconds(30);
+ final Duration timeoutToVerifyAckSend = Duration.ofSeconds(30);
@Before
public void setUp() throws Exception {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/MergeLogFilesIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/MergeLogFilesIntegrationTest.java
index 3c54e67..22397af 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/MergeLogFilesIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/MergeLogFilesIntegrationTest.java
@@ -49,7 +49,7 @@ import org.apache.geode.test.junit.categories.LoggingTest;
@Category(LoggingTest.class)
public class MergeLogFilesIntegrationTest {
- private static final long TIMEOUT_MILLIS = getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = getTimeout().toMillis();
private final Object lock = new Object();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/DistributedSystemMXBeanIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/DistributedSystemMXBeanIntegrationTest.java
index 85b9f79..1645082 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/management/DistributedSystemMXBeanIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/management/DistributedSystemMXBeanIntegrationTest.java
@@ -75,7 +75,7 @@ public class DistributedSystemMXBeanIntegrationTest {
private static final Logger logger = LogService.getLogger();
- private static final long TIMEOUT = getTimeout().getValueInMS();
+ private static final long TIMEOUT = getTimeout().toMillis();
private static final NotificationFilter SYSTEM_ALERT_FILTER =
notification -> notification.getType().equals(SYSTEM_ALERT);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/InternalResourceManagerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/InternalResourceManagerTest.java
index ded921a..540ecce 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/InternalResourceManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/InternalResourceManagerTest.java
@@ -75,7 +75,7 @@ public class InternalResourceManagerTest {
ScheduledExecutorService executor = resourceManager.getExecutor();
Future<Boolean> submittedTask =
- executor.submit(() -> hangLatch.await(getTimeout().getValue(), SECONDS));
+ executor.submit(() -> hangLatch.await(getTimeout().getSeconds(), SECONDS));
resourceManager.close();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLoggerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLoggerTest.java
index ae1bb44..ec7029c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLoggerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLoggerTest.java
@@ -48,7 +48,7 @@ import org.apache.geode.test.junit.rules.ExecutorServiceRule;
public class SingleThreadColocationLoggerTest {
- private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().toMillis();
private Function<PartitionedRegion, Set<String>> allColocationRegionsProvider;
private Consumer<String> logger;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/monitoring/executor/AbstractExecutorGroupJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/monitoring/executor/AbstractExecutorGroupJUnitTest.java
index 4c61195..4ed32b8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/monitoring/executor/AbstractExecutorGroupJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/monitoring/executor/AbstractExecutorGroupJUnitTest.java
@@ -33,7 +33,7 @@ public class AbstractExecutorGroupJUnitTest {
private final AbstractExecutor abstractExecutorGroup =
new FunctionExecutionPooledExecutorGroup(null);
- private static final long timeoutInMilliseconds = GeodeAwaitility.getTimeout().getValueInMS();
+ private static final long timeoutInMilliseconds = GeodeAwaitility.getTimeout().toMillis();
@Test
public void testInitializationValues() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatchTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatchTest.java
index 9a1561f..8f719b4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatchTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatchTest.java
@@ -41,7 +41,7 @@ import org.apache.geode.test.junit.rules.ExecutorServiceRule;
public class StoppableCountDownLatchTest {
- private static final long TIMEOUT_MILLIS = getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = getTimeout().toMillis();
private CancelCriterion stopper;
@@ -234,7 +234,7 @@ public class StoppableCountDownLatchTest {
Future<Void> latchFuture = executorServiceRule.submit(() -> {
theThread.set(Thread.currentThread());
- Throwable thrown = catchThrowable(() -> latch.await(getTimeout().getValueInMS()));
+ Throwable thrown = catchThrowable(() -> latch.await(getTimeout().toMillis()));
errorCollector
.checkSucceeds(() -> assertThat(thrown).isInstanceOf(InterruptedException.class));
});
diff --git a/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/PutAllClientServerDistributedTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/PutAllClientServerDistributedTest.java
index 65580f8..65132a8 100755
--- a/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/PutAllClientServerDistributedTest.java
+++ b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/PutAllClientServerDistributedTest.java
@@ -122,7 +122,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolde
@SuppressWarnings("serial")
public class PutAllClientServerDistributedTest implements Serializable {
- private static final long TIMEOUT_MILLIS = getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = getTimeout().toMillis();
private static final int ONE_HUNDRED = 100;
private static final int ONE_THOUSAND = 1000;
diff --git a/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestBase.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestBase.java
index 529ac87..796e58f 100644
--- a/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestBase.java
+++ b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestBase.java
@@ -28,15 +28,13 @@ import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertNotNull;
-import java.util.Arrays;
+import java.time.Duration;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
import org.apache.logging.log4j.Logger;
-import org.awaitility.Duration;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.InterestResultPolicy;
@@ -71,9 +69,9 @@ import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
public class DurableClientTestBase extends JUnit4DistributedTestCase {
protected static final Logger logger = LogService.getLogger();
- private static final Duration VERY_LONG_DURABLE_CLIENT_TIMEOUT = new Duration(10, MINUTES);
+ private static final Duration VERY_LONG_DURABLE_CLIENT_TIMEOUT = Duration.ofMinutes(10);
static final int VERY_LONG_DURABLE_TIMEOUT_SECONDS =
- (int) VERY_LONG_DURABLE_CLIENT_TIMEOUT.getValueInMS() / 1000;
+ (int) VERY_LONG_DURABLE_CLIENT_TIMEOUT.getSeconds();
static final int HEAVY_TEST_LOAD_DELAY_SUPPORT_MULTIPLIER = 10;
VM server1VM;
@@ -241,7 +239,7 @@ public class DurableClientTestBase extends JUnit4DistributedTestCase {
if (value.getClass().isArray()) {
sb.append("{");
- sb.append(Arrays.toString((Object[]) value));
+ sb.append(java.util.Arrays.toString((Object[]) value));
sb.append("}");
} else {
sb.append(value);
@@ -418,7 +416,7 @@ public class DurableClientTestBase extends JUnit4DistributedTestCase {
// Get the CacheClientProxy or not (if proxy set is empty)
CacheClientProxy proxy = null;
- Iterator<CacheClientProxy> i = notifier.getClientProxies().iterator();
+ java.util.Iterator<CacheClientProxy> i = notifier.getClientProxies().iterator();
if (i.hasNext()) {
proxy = i.next();
}
@@ -430,7 +428,7 @@ public class DurableClientTestBase extends JUnit4DistributedTestCase {
CacheClientNotifier notifier = getBridgeServer().getAcceptor().getCacheClientNotifier();
// Get the CacheClientProxy or not (if proxy set is empty)
- Iterator<CacheClientProxy> i = notifier.getClientProxies().iterator();
+ java.util.Iterator<CacheClientProxy> i = notifier.getClientProxies().iterator();
StringBuilder sb = new StringBuilder();
while (i.hasNext()) {
sb.append(" [");
@@ -648,7 +646,7 @@ public class DurableClientTestBase extends JUnit4DistributedTestCase {
ClientProxyMembershipID proxyId = clientProxy.getProxyID();
CqService cqService = ((InternalCache) CacheServerTestUtil.getCache()).getCqService();
cqService.start();
- List<String> cqNames = cqService.getAllDurableClientCqs(proxyId);
+ java.util.List<String> cqNames = cqService.getAllDurableClientCqs(proxyId);
assertThat(expectedNumber).isEqualTo(cqNames.size());
} catch (Exception e) {
throw new CacheException(e) {};
diff --git a/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/DistributedExecutorServiceRuleTest.java b/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/DistributedExecutorServiceRuleTest.java
index 4640026..4767d48 100644
--- a/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/DistributedExecutorServiceRuleTest.java
+++ b/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/DistributedExecutorServiceRuleTest.java
@@ -35,7 +35,7 @@ import org.apache.geode.test.dunit.rules.DistributedRule;
@SuppressWarnings("serial")
public class DistributedExecutorServiceRuleTest implements Serializable {
- private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().toMillis();
private static final AtomicReference<ExecutorService> executorService = new AtomicReference<>();
private static final AtomicReference<CountDownLatch> latch = new AtomicReference<>();
diff --git a/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleAwaitIntegrationTest.java b/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleAwaitIntegrationTest.java
index d6cab7b..ece05e0 100644
--- a/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleAwaitIntegrationTest.java
+++ b/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleAwaitIntegrationTest.java
@@ -22,12 +22,12 @@ import java.util.Collection;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
+import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.function.UnaryOperator;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.awaitility.core.ConditionTimeoutException;
-import org.awaitility.core.Predicate;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/SharedCountersRuleDistributedTest.java b/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/SharedCountersRuleDistributedTest.java
index 5af3e22..c6191d4 100644
--- a/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/SharedCountersRuleDistributedTest.java
+++ b/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/SharedCountersRuleDistributedTest.java
@@ -46,7 +46,7 @@ import org.apache.geode.test.dunit.rules.SharedCountersRule;
@SuppressWarnings("serial")
public class SharedCountersRuleDistributedTest implements Serializable {
- private static final long TIMEOUT_MILLIS = getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = getTimeout().toMillis();
private static final String ID = "ID";
private static ExecutorService executor;
diff --git a/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/tests/AsyncInvocationTimeoutDistributedTest.java b/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/tests/AsyncInvocationTimeoutDistributedTest.java
index 8261c30..af740f6 100644
--- a/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/tests/AsyncInvocationTimeoutDistributedTest.java
+++ b/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/tests/AsyncInvocationTimeoutDistributedTest.java
@@ -38,7 +38,7 @@ import org.apache.geode.test.dunit.rules.DistributedRule;
@SuppressWarnings("serial")
public class AsyncInvocationTimeoutDistributedTest implements Serializable {
- private static final long TIMEOUT_MILLIS = getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = getTimeout().toMillis();
private static final AtomicReference<Long> threadId = new AtomicReference<>();
private static final AtomicReference<CountDownLatch> latch = new AtomicReference<>();
diff --git a/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/tests/StackTraceDistributedTest.java b/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/tests/StackTraceDistributedTest.java
index 9045a06..623374b 100644
--- a/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/tests/StackTraceDistributedTest.java
+++ b/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/tests/StackTraceDistributedTest.java
@@ -38,7 +38,7 @@ import org.apache.geode.test.dunit.rules.DistributedRule;
public class StackTraceDistributedTest {
- private static final long TIMEOUT_MILLIS = getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = getTimeout().toMillis();
private static final Pattern COUNTDOWNLATCH_AWAIT = Pattern.compile(
".*java\\.util\\.concurrent\\.CountDownLatch\\.await\\(CountDownLatch\\.java:\\d+\\).*");
diff --git a/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/tests/VMDumpThreadsDistributedTest.java b/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/tests/VMDumpThreadsDistributedTest.java
index d13ce9a..cad6516 100644
--- a/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/tests/VMDumpThreadsDistributedTest.java
+++ b/geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/tests/VMDumpThreadsDistributedTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.test.dunit.rules.DistributedRule;
@SuppressWarnings("serial")
public class VMDumpThreadsDistributedTest implements Serializable {
- private static final long TIMEOUT_MILLIS = getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = getTimeout().toMillis();
// Oracle: "pool-2-thread-1" Id=20 WAITING on
// java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject@4efca67d
diff --git a/geode-dunit/src/main/java/org/apache/geode/test/dunit/AsyncInvocation.java b/geode-dunit/src/main/java/org/apache/geode/test/dunit/AsyncInvocation.java
index 85919e7..cfc6e30 100644
--- a/geode-dunit/src/main/java/org/apache/geode/test/dunit/AsyncInvocation.java
+++ b/geode-dunit/src/main/java/org/apache/geode/test/dunit/AsyncInvocation.java
@@ -54,7 +54,7 @@ import org.apache.geode.test.dunit.internal.StackTrace;
*/
public class AsyncInvocation<V> implements Future<V> {
- private static final long DEFAULT_TIMEOUT_MILLIS = getTimeout().getValueInMS();
+ private static final long DEFAULT_TIMEOUT_MILLIS = getTimeout().toMillis();
private final Thread thread;
diff --git a/geode-dunit/src/test/java/org/apache/geode/test/dunit/internal/VMEventNotifierTest.java b/geode-dunit/src/test/java/org/apache/geode/test/dunit/internal/VMEventNotifierTest.java
index 039b471..f516986 100644
--- a/geode-dunit/src/test/java/org/apache/geode/test/dunit/internal/VMEventNotifierTest.java
+++ b/geode-dunit/src/test/java/org/apache/geode/test/dunit/internal/VMEventNotifierTest.java
@@ -44,7 +44,7 @@ import org.apache.geode.test.junit.rules.ExecutorServiceRule;
@RunWith(JUnitParamsRunner.class)
public class VMEventNotifierTest {
- private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().toMillis();
@Rule
public ExecutorServiceRule executorServiceRule = new ExecutorServiceRule();
diff --git a/geode-gfsh/src/integrationTest/java/org/apache/geode/management/internal/cli/util/LogExporterFileIntegrationTest.java b/geode-gfsh/src/integrationTest/java/org/apache/geode/management/internal/cli/util/LogExporterFileIntegrationTest.java
index b94125e..068a34a 100644
--- a/geode-gfsh/src/integrationTest/java/org/apache/geode/management/internal/cli/util/LogExporterFileIntegrationTest.java
+++ b/geode-gfsh/src/integrationTest/java/org/apache/geode/management/internal/cli/util/LogExporterFileIntegrationTest.java
@@ -109,8 +109,8 @@ public class LogExporterFileIntegrationTest {
List<File> exportedFiles = Stream.of(unzippedExportDir.listFiles())
.sorted(Comparator.comparing(File::getName)).collect(toList());
- assertThat(exportedFiles.get(0)).hasSameContentAs(logFile1);
- assertThat(exportedFiles.get(1)).hasSameContentAs(logFile2);
+ assertThat(exportedFiles.get(0)).hasSameTextualContentAs(logFile1);
+ assertThat(exportedFiles.get(1)).hasSameTextualContentAs(logFile2);
}
@Test
diff --git a/geode-gfsh/src/test/java/org/apache/geode/management/internal/web/http/support/HttpRequesterTest.java b/geode-gfsh/src/test/java/org/apache/geode/management/internal/web/http/support/HttpRequesterTest.java
index 09387bb..6b62ff7 100644
--- a/geode-gfsh/src/test/java/org/apache/geode/management/internal/web/http/support/HttpRequesterTest.java
+++ b/geode-gfsh/src/test/java/org/apache/geode/management/internal/web/http/support/HttpRequesterTest.java
@@ -94,7 +94,7 @@ public class HttpRequesterTest {
response.getHeaders().add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
Object result = requester.extractResponse(response);
Path fileResult = (Path) result;
- assertThat(fileResult).hasSameContentAs(responseFile.toPath());
+ assertThat(fileResult).hasSameTextualContentAs(responseFile.toPath());
}
@Test
@@ -105,6 +105,7 @@ public class HttpRequesterTest {
assertThat(requester.createURI("http://test.org", "abc", "key", "value").toString())
.isEqualTo("http://test.org/abc?key=value");
+
assertThat(requester.createURI("http://test.org", "abc", "a-b", "c d").toString())
.isEqualTo("http://test.org/abc?a-b=c%20d");
diff --git a/geode-junit/src/main/java/org/apache/geode/test/awaitility/GeodeAwaitility.java b/geode-junit/src/main/java/org/apache/geode/test/awaitility/GeodeAwaitility.java
index 00877c9..f42ad83 100644
--- a/geode-junit/src/main/java/org/apache/geode/test/awaitility/GeodeAwaitility.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/awaitility/GeodeAwaitility.java
@@ -15,12 +15,9 @@
package org.apache.geode.test.awaitility;
import static java.lang.Long.getLong;
-import static java.time.Duration.ofMillis;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
-import org.awaitility.Duration;
import org.awaitility.core.ConditionFactory;
import org.mockito.Mockito;
@@ -35,9 +32,9 @@ public class GeodeAwaitility {
*/
public static final String TIMEOUT_SECONDS_PROPERTY = "GEODE_AWAITILITY_TIMEOUT_SECONDS";
- private static final Duration DEFAULT_TIMEOUT = Duration.FIVE_MINUTES;
- private static final Duration POLL_INTERVAL = new Duration(50, TimeUnit.MILLISECONDS);
- private static final Duration POLL_DELAY = Duration.ONE_HUNDRED_MILLISECONDS;
+ private static final Duration DEFAULT_TIMEOUT = Duration.ofMinutes(5);
+ private static final Duration POLL_INTERVAL = Duration.ofMillis(50);
+ private static final Duration POLL_DELAY = Duration.ofMillis(100);
/**
* Start building an await statement using Geode's default testing timeout.
@@ -75,7 +72,7 @@ public class GeodeAwaitility {
* <pre>
* import static org.apache.geode.test.awaitility.GeodeAwaitility.getTimeout;
*
- * private static final long TIMEOUT = getTimeout().getValueInMS();
+ * private static final long TIMEOUT = getTimeout().toMillis();
*
* {@literal @}Test
* public void test() {
@@ -89,17 +86,6 @@ public class GeodeAwaitility {
* @return the current timeout value as a {@code Duration}
*/
public static Duration getTimeout() {
- return new Duration(getLong(TIMEOUT_SECONDS_PROPERTY, DEFAULT_TIMEOUT.getValue()), SECONDS);
- }
-
- /**
- * Converts from {@code org.awaitility.Duration} to {@link java.time.Duration}.
- *
- * @param duration a {@code org.awaitility.Duration} to convert to {@code java.time.Duration}
- *
- * @return the {@code java.time.Duration} value of duration
- */
- public static java.time.Duration toTimeDuration(Duration duration) {
- return ofMillis(duration.getValueInMS());
+ return Duration.ofSeconds(getLong(TIMEOUT_SECONDS_PROPERTY, DEFAULT_TIMEOUT.getSeconds()));
}
}
diff --git a/geode-junit/src/main/java/org/apache/geode/test/process/ProcessWrapper.java b/geode-junit/src/main/java/org/apache/geode/test/process/ProcessWrapper.java
index 4cab8f8..061ac19 100644
--- a/geode-junit/src/main/java/org/apache/geode/test/process/ProcessWrapper.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/process/ProcessWrapper.java
@@ -58,7 +58,7 @@ import org.apache.geode.test.awaitility.GeodeAwaitility;
public class ProcessWrapper implements Consumer<String> {
private static final Logger logger = LogService.getLogger();
- private static final long PROCESS_TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().getValueInMS();
+ private static final long PROCESS_TIMEOUT_MILLIS = GeodeAwaitility.getTimeout().toMillis();
private static final long DELAY = 10;
private final boolean headless;
diff --git a/geode-junit/src/test/java/org/apache/geode/test/awaitility/GeodeAwaitilityTest.java b/geode-junit/src/test/java/org/apache/geode/test/awaitility/GeodeAwaitilityTest.java
index a6a6df8..7735745 100644
--- a/geode-junit/src/test/java/org/apache/geode/test/awaitility/GeodeAwaitilityTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/awaitility/GeodeAwaitilityTest.java
@@ -15,16 +15,11 @@
package org.apache.geode.test.awaitility;
import static java.lang.String.valueOf;
-import static java.time.Duration.ofMinutes;
import static org.apache.geode.test.awaitility.GeodeAwaitility.TIMEOUT_SECONDS_PROPERTY;
import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
import static org.apache.geode.test.awaitility.GeodeAwaitility.getTimeout;
-import static org.apache.geode.test.awaitility.GeodeAwaitility.toTimeDuration;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
-import static org.awaitility.Duration.FIVE_MINUTES;
-import static org.awaitility.Duration.ONE_MINUTE;
-import static org.awaitility.Duration.ONE_SECOND;
import java.time.Duration;
@@ -48,14 +43,16 @@ public class GeodeAwaitilityTest {
@Test
public void getTimeoutIsFiveMinutesByDefault() {
- assertThat(getTimeout()).isEqualTo(FIVE_MINUTES);
+ Duration fiveMinutes = Duration.ofMinutes(5);
+ assertThat(getTimeout()).isEqualTo(fiveMinutes);
}
@Test
public void getTimeoutIsOverriddenWithSystemProperty() {
- System.setProperty(TIMEOUT_SECONDS_PROPERTY, valueOf(ONE_MINUTE.getValue()));
+ Duration oneMinute = Duration.ofMinutes(1);
+ System.setProperty(TIMEOUT_SECONDS_PROPERTY, valueOf(oneMinute.getSeconds()));
- assertThat(getTimeout()).isEqualTo(ONE_MINUTE);
+ assertThat(getTimeout()).isEqualTo(oneMinute);
}
@Test
@@ -70,18 +67,12 @@ public class GeodeAwaitilityTest {
@Test
public void awaitWithAliasActuallyUsesAlias() {
- System.setProperty(TIMEOUT_SECONDS_PROPERTY, valueOf(ONE_SECOND.getValue()));
+ Duration oneMinute = Duration.ofMinutes(1);
+ System.setProperty(TIMEOUT_SECONDS_PROPERTY, valueOf(oneMinute.getSeconds()));
String alias = testName.getMethodName();
Throwable thrown = catchThrowable(() -> await(alias).until(() -> false));
assertThat(thrown).isInstanceOf(ConditionTimeoutException.class).hasMessageContaining(alias);
}
-
- @Test
- public void toTimeDurationConverts() {
- assertThat(ONE_MINUTE).isNotEqualTo(ofMinutes(1));
-
- assertThat(toTimeDuration(ONE_MINUTE)).isInstanceOf(Duration.class).isEqualTo(ofMinutes(1));
- }
}
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleGetThreadsTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleGetThreadsTest.java
index fc4951b..af87ddb 100644
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleGetThreadsTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleGetThreadsTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
*/
public class ExecutorServiceRuleGetThreadsTest {
- private static final long TIMEOUT_MILLIS = getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = getTimeout().toMillis();
private final CountDownLatch terminateLatch = new CountDownLatch(1);
private final AtomicBoolean submittedChildren = new AtomicBoolean();
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java
index f66ac67..c235242 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java
@@ -33,7 +33,7 @@ import org.apache.geode.test.junit.runners.TestRunner;
*/
public class ExpectedTimeoutRuleTest {
- private static final long TIMEOUT_MILLIS = getTimeout().getValueInMS();
+ private static final long TIMEOUT_MILLIS = getTimeout().toMillis();
@Test
public void passesUnused() {
diff --git a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index e534263..f734e81 100644
--- a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++ b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -910,7 +910,7 @@ public class GMSHealthMonitorJUnitTest {
gmsHealthMonitor.doTCPCheckMember(otherMember, mySocket.getLocalPort(), true);
mySocket.close();
serverThread.interrupt();
- serverThread.join(getTimeout().getValueInMS());
+ serverThread.join(getTimeout().toMillis());
assertThat(System.currentTimeMillis()).isGreaterThanOrEqualTo(startTime + memberTimeout);
}
diff --git a/geode-redis/src/distributedTest/java/org/apache/geode/redis/RedisDistDUnitTest.java b/geode-redis/src/distributedTest/java/org/apache/geode/redis/RedisDistDUnitTest.java
index 74fe15f..36b46be 100644
--- a/geode-redis/src/distributedTest/java/org/apache/geode/redis/RedisDistDUnitTest.java
+++ b/geode-redis/src/distributedTest/java/org/apache/geode/redis/RedisDistDUnitTest.java
@@ -58,7 +58,7 @@ public class RedisDistDUnitTest implements Serializable {
private static int server2Port;
private static final int JEDIS_TIMEOUT =
- Math.toIntExact(GeodeAwaitility.getTimeout().getValueInMS());
+ Math.toIntExact(GeodeAwaitility.getTimeout().toMillis());
private abstract static class ClientTestBase extends SerializableRunnable {
int port;
diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/GeoCoder.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/GeoCoder.java
index 6eab080..2693a29 100644
--- a/geode-redis/src/main/java/org/apache/geode/redis/internal/GeoCoder.java
+++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/GeoCoder.java
@@ -158,8 +158,8 @@ public class GeoCoder {
double radiusMeters) {
HashArea boundingBox = boundingBox(longitude, latitude, radiusMeters);
int steps =
- Math.max(1, GeoHash.hashLengthToCoverBoundingBox(boundingBox.maxlat, boundingBox.maxlon,
- boundingBox.minlat, boundingBox.minlon));
+ Math.max(1, GeoHash.hashLengthToCoverBoundingBox(boundingBox.minlat, boundingBox.maxlon,
+ boundingBox.maxlat, boundingBox.minlon));
List<String> extra = new ArrayList<>();
// Large distance boundary condition
@@ -167,8 +167,8 @@ public class GeoCoder {
extra.addAll(GeoHash.neighbours(GeoHash.encodeHash(latitude, longitude, steps)));
}
- Set<String> areas = GeoHash.coverBoundingBox(boundingBox.maxlat, boundingBox.maxlon,
- boundingBox.minlat, boundingBox.minlon, steps).getHashes();
+ Set<String> areas = GeoHash.coverBoundingBox(boundingBox.maxlat, boundingBox.minlon,
+ boundingBox.minlat, boundingBox.maxlon, steps).getHashes();
if (!extra.isEmpty()) {
extra.forEach(ex -> areas.add(ex));
}
diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle
index b470293..97c6c02 100644
--- a/geode-wan/build.gradle
+++ b/geode-wan/build.gradle
@@ -30,7 +30,7 @@ dependencies {
implementation(project(':geode-tcp-server'))
implementation(project(':geode-core'))
- compileOnly('org.apache.logging.log4j:log4j-api:2.12.1')
+ compileOnly('org.apache.logging.log4j:log4j-api:2.13.1')
testImplementation(project(':geode-junit'))
testImplementation('org.assertj:assertj-core')