You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2020/09/28 20:09:42 UTC
[geode] branch develop updated: GEODE-8469: Bump assertj from
3.15.0 to 3.17.2 (#5539)
This is an automated email from the ASF dual-hosted git repository.
onichols 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 56f5508 GEODE-8469: Bump assertj from 3.15.0 to 3.17.2 (#5539)
56f5508 is described below
commit 56f5508a2479b98b3e0aabd07bac03fbe1e602d1
Author: Owen Nichols <34...@users.noreply.github.com>
AuthorDate: Mon Sep 28 13:08:54 2020 -0700
GEODE-8469: Bump assertj from 3.15.0 to 3.17.2 (#5539)
* Bump assertj from 3.15.0 to 3.17.2
* Use usingRecursiveComparison().isEqualTo, the old way was deprecated
Co-authored-by: M. Oleske <mi...@oleske.engineer>
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 2 +-
.../org/apache/geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
.../java/org/apache/geode/management/configuration/ClassNameTest.java | 4 ++--
.../org/apache/geode/management/configuration/DeploymentTest.java | 2 +-
.../java/org/apache/geode/management/runtime/DeploymentInfoTest.java | 2 +-
5 files changed, 6 insertions(+), 6 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 60b291a..bab4010 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -418,7 +418,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>3.15.0</version>
+ <version>3.17.2</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 62eea99..b26f10c 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
@@ -148,7 +148,7 @@ class DependencyConstraints implements Plugin<Project> {
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.15.0')
+ api(group: 'org.assertj', name: 'assertj-core', version: '3.17.2')
api(group: 'org.awaitility', name: 'awaitility', version: '4.0.3')
api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.66')
api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.8.1')
diff --git a/geode-management/src/test/java/org/apache/geode/management/configuration/ClassNameTest.java b/geode-management/src/test/java/org/apache/geode/management/configuration/ClassNameTest.java
index 0d9b8bc..6fc99b9 100644
--- a/geode-management/src/test/java/org/apache/geode/management/configuration/ClassNameTest.java
+++ b/geode-management/src/test/java/org/apache/geode/management/configuration/ClassNameTest.java
@@ -103,13 +103,13 @@ public class ClassNameTest {
properties.put("key1", "value1");
ClassName className = new ClassName("abc", properties);
ClassName className1 = new ClassName("abc", mapper.writeValueAsString(properties));
- assertThat(className).isEqualToComparingFieldByField(className1);
+ assertThat(className).usingRecursiveComparison().isEqualTo(className1);
String json = mapper.writeValueAsString(className);
String json1 = mapper.writeValueAsString(className1);
assertThat(json).isEqualTo(json1);
ClassName className2 = mapper.readValue(json, ClassName.class);
- assertThat(className2).isEqualToComparingFieldByField(className);
+ assertThat(className2).usingRecursiveComparison().isEqualTo(className);
}
@Test
diff --git a/geode-management/src/test/java/org/apache/geode/management/configuration/DeploymentTest.java b/geode-management/src/test/java/org/apache/geode/management/configuration/DeploymentTest.java
index 16849dc..51b6aff 100644
--- a/geode-management/src/test/java/org/apache/geode/management/configuration/DeploymentTest.java
+++ b/geode-management/src/test/java/org/apache/geode/management/configuration/DeploymentTest.java
@@ -64,7 +64,7 @@ public class DeploymentTest {
deployment.setDeployedTime("deployedTime");
String json = mapper.writeValueAsString(deployment);
Deployment newValue = mapper.readValue(json, Deployment.class);
- assertThat(newValue).isEqualToComparingFieldByField(deployment);
+ assertThat(newValue).usingRecursiveComparison().isEqualTo(deployment);
}
@Test
diff --git a/geode-management/src/test/java/org/apache/geode/management/runtime/DeploymentInfoTest.java b/geode-management/src/test/java/org/apache/geode/management/runtime/DeploymentInfoTest.java
index 20f3e34..95871e4 100644
--- a/geode-management/src/test/java/org/apache/geode/management/runtime/DeploymentInfoTest.java
+++ b/geode-management/src/test/java/org/apache/geode/management/runtime/DeploymentInfoTest.java
@@ -48,7 +48,7 @@ public class DeploymentInfoTest {
deploymentInfo.setLastModified("lastModified");
String json = mapper.writeValueAsString(deploymentInfo);
DeploymentInfo newValue = mapper.readValue(json, DeploymentInfo.class);
- assertThat(newValue).isEqualToComparingFieldByField(deploymentInfo);
+ assertThat(newValue).usingRecursiveComparison().isEqualTo(deploymentInfo);
}
}