This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 205cb68bca HDDS-10102. Replace Awaitility with existing utils (#5977)
205cb68bca is described below
commit 205cb68bca3ea8475542b5fff1bb8dbef036effc
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Jan 11 13:31:35 2024 +0100
HDDS-10102. Replace Awaitility with existing utils (#5977)
---
hadoop-ozone/integration-test/pom.xml | 9 +--
.../ozone/om/TestOzoneManagerHASnapshot.java | 85 ++++++++++------------
.../hadoop/ozone/om/snapshot/TestOmSnapshot.java | 31 ++++----
hadoop-ozone/ozone-manager/pom.xml | 5 --
.../hadoop/ozone/om/TestSstFilteringService.java | 50 +++++--------
.../ozone/om/snapshot/TestSnapshotDiffManager.java | 19 +++--
pom.xml | 12 +--
7 files changed, 90 insertions(+), 121 deletions(-)
diff --git a/hadoop-ozone/integration-test/pom.xml
b/hadoop-ozone/integration-test/pom.xml
index 21aff1b08f..3eef8fa58c 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -254,13 +254,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</exclusions>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
</dependency>
<dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
</dependency>
</dependencies>
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHASnapshot.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHASnapshot.java
index 4dc0ab111b..5d9f8a0d48 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHASnapshot.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHASnapshot.java
@@ -38,7 +38,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import java.io.IOException;
-import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -48,7 +47,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;
import static
org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.DONE;
import static
org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.IN_PROGRESS;
-import static org.awaitility.Awaitility.await;
+import static org.apache.ozone.test.LambdaTestUtils.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -124,8 +123,7 @@ public class TestOzoneManagerHASnapshot {
cluster.shutdownOzoneManager(omLeader);
cluster.restartOzoneManager(omLeader, true);
- await().atMost(Duration.ofSeconds(120))
- .until(() -> cluster.getOMLeader() != null);
+ await(120_000, 100, () -> cluster.getOMLeader() != null);
String newLeader = cluster.getOMLeader().getOMNodeId();
@@ -165,24 +163,23 @@ public class TestOzoneManagerHASnapshot {
List<UUID> snapshotIds = new ArrayList<>();
for (OzoneManager ozoneManager : ozoneManagers) {
- await().atMost(Duration.ofSeconds(120))
- .until(() -> {
- SnapshotInfo snapshotInfo;
- try {
- snapshotInfo = ozoneManager.getMetadataManager()
- .getSnapshotInfoTable()
- .get(SnapshotInfo.getTableKey(volumeName,
- bucketName,
- snapshotName));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
- if (snapshotInfo != null) {
- snapshotIds.add(snapshotInfo.getSnapshotId());
- }
- return snapshotInfo != null;
- });
+ await(120_000, 100, () -> {
+ SnapshotInfo snapshotInfo;
+ try {
+ snapshotInfo = ozoneManager.getMetadataManager()
+ .getSnapshotInfoTable()
+ .get(SnapshotInfo.getTableKey(volumeName,
+ bucketName,
+ snapshotName));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ if (snapshotInfo != null) {
+ snapshotIds.add(snapshotInfo.getSnapshotId());
+ }
+ return snapshotInfo != null;
+ });
}
assertEquals(1, snapshotIds.stream().distinct().count());
@@ -199,27 +196,26 @@ public class TestOzoneManagerHASnapshot {
List<String> snapshotNames = new ArrayList<>();
for (OzoneManager ozoneManager : ozoneManagers) {
- await().atMost(Duration.ofSeconds(120))
- .until(() -> {
- String snapshotPrefix = OM_KEY_PREFIX + volumeName +
- OM_KEY_PREFIX + bucketName;
- SnapshotInfo snapshotInfo = null;
- try (TableIterator<String, ?
- extends Table.KeyValue<String, SnapshotInfo>>
- iterator = ozoneManager.getMetadataManager()
- .getSnapshotInfoTable().iterator(snapshotPrefix)) {
- while (iterator.hasNext()) {
- snapshotInfo = iterator.next().getValue();
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
- if (snapshotInfo != null) {
- snapshotNames.add(snapshotInfo.getName());
- }
- return snapshotInfo != null;
- });
+ await(120_000, 100, () -> {
+ String snapshotPrefix = OM_KEY_PREFIX + volumeName +
+ OM_KEY_PREFIX + bucketName;
+ SnapshotInfo snapshotInfo = null;
+ try (TableIterator<String, ?
+ extends Table.KeyValue<String, SnapshotInfo>>
+ iterator = ozoneManager.getMetadataManager()
+ .getSnapshotInfoTable().iterator(snapshotPrefix)) {
+ while (iterator.hasNext()) {
+ snapshotInfo = iterator.next().getValue();
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ if (snapshotInfo != null) {
+ snapshotNames.add(snapshotInfo.getName());
+ }
+ return snapshotInfo != null;
+ });
}
assertEquals(1, snapshotNames.stream().distinct().count());
@@ -254,8 +250,7 @@ public class TestOzoneManagerHASnapshot {
cluster.shutdownOzoneManager(omLeader);
cluster.restartOzoneManager(omLeader, true);
- await().atMost(Duration.ofSeconds(180))
- .until(() -> cluster.getOMLeader() != null);
+ await(180_000, 100, () -> cluster.getOMLeader() != null);
assertNotNull(cluster.getOMLeader());
OmMetadataManagerImpl metadataManager = (OmMetadataManagerImpl) cluster
.getOMLeader().getMetadataManager();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
index 8d09465e81..6d8bc353eb 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
@@ -20,7 +20,6 @@ package org.apache.hadoop.ozone.om.snapshot;
import java.net.URI;
import java.net.URISyntaxException;
-import java.time.Duration;
import java.util.List;
import com.google.common.collect.Lists;
@@ -134,9 +133,8 @@ import static
org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.CA
import static
org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.DONE;
import static
org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.IN_PROGRESS;
import static
org.apache.ozone.rocksdiff.RocksDBCheckpointDiffer.COLUMN_FAMILIES_TO_TRACK_IN_DAG;
+import static org.apache.ozone.test.LambdaTestUtils.await;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Awaitility.await;
-import static org.awaitility.Awaitility.with;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -163,8 +161,8 @@ public abstract class TestOmSnapshot {
private static final String SNAPSHOT_KEY_PATTERN_STRING = "(.+)/(.+)/(.+)";
private static final Pattern SNAPSHOT_KEY_PATTERN =
Pattern.compile(SNAPSHOT_KEY_PATTERN_STRING);
- private static final Duration POLL_INTERVAL_DURATION =
Duration.ofMillis(500);
- private static final Duration POLL_MAX_DURATION = Duration.ofSeconds(10);
+ private static final int POLL_INTERVAL_MILLIS = 500;
+ private static final int POLL_MAX_WAIT_MILLIS = 120_000;
private MiniOzoneCluster cluster;
private OzoneClient client;
@@ -294,15 +292,12 @@ public abstract class TestOmSnapshot {
// Wait for the finalization to be marked as done.
// 10s timeout should be plenty.
try {
- with().atMost(POLL_MAX_DURATION)
- .pollInterval(POLL_INTERVAL_DURATION)
- .await()
- .until(() -> {
- final UpgradeFinalizer.StatusAndMessages progress =
- omClient.queryUpgradeFinalizationProgress(
- upgradeClientID, false, false);
- return isDone(progress.status());
- });
+ await(POLL_MAX_WAIT_MILLIS, POLL_INTERVAL_MILLIS, () -> {
+ final UpgradeFinalizer.StatusAndMessages progress =
+ omClient.queryUpgradeFinalizationProgress(
+ upgradeClientID, false, false);
+ return isDone(progress.status());
+ });
} catch (Exception e) {
fail("Unexpected exception while waiting for "
+ "the OM upgrade to finalize: " + e.getMessage());
@@ -2079,8 +2074,8 @@ public abstract class TestOmSnapshot {
// job finishes.
cluster.restartOzoneManager();
stopKeyManager();
- await().atMost(Duration.ofSeconds(120)).
- until(() -> cluster.getOzoneManager().isRunning());
+ await(POLL_MAX_WAIT_MILLIS, POLL_INTERVAL_MILLIS,
+ () -> cluster.getOzoneManager().isRunning());
response = store.snapshotDiff(volumeName, bucketName,
snapshot1, snapshot2, null, 0, forceFullSnapshotDiff,
@@ -2124,8 +2119,8 @@ public abstract class TestOmSnapshot {
// the restart.
cluster.restartOzoneManager();
stopKeyManager();
- await().atMost(Duration.ofSeconds(120)).
- until(() -> cluster.getOzoneManager().isRunning());
+ await(POLL_MAX_WAIT_MILLIS, POLL_INTERVAL_MILLIS,
+ () -> cluster.getOzoneManager().isRunning());
while (nextToken == null || StringUtils.isNotEmpty(nextToken)) {
diffReport = fetchReportPage(volumeName, bucketName, snapshot1,
diff --git a/hadoop-ozone/ozone-manager/pom.xml
b/hadoop-ozone/ozone-manager/pom.xml
index 96f0e762f8..8438dbbf2c 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -232,11 +232,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestSstFilteringService.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestSstFilteringService.java
index 2277b6ce67..edc228a5d3 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestSstFilteringService.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestSstFilteringService.java
@@ -38,7 +38,6 @@ import org.apache.hadoop.ozone.om.snapshot.ReferenceCounted;
import org.apache.hadoop.ozone.om.snapshot.SnapshotCache;
import
org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.apache.ratis.util.ExitUtils;
-import org.awaitility.core.ConditionTimeoutException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -48,7 +47,6 @@ import org.rocksdb.LiveFileMetaData;
import java.io.File;
import java.io.IOException;
-import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -57,13 +55,14 @@ import java.util.List;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import static
org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_REPORT_INTERVAL;
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DB_PROFILE;
import static org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS;
import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SNAPSHOT_SST_FILTERING_SERVICE_INTERVAL;
-import static org.awaitility.Awaitility.with;
+import static org.apache.ozone.test.LambdaTestUtils.await;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -136,7 +135,7 @@ public class TestSstFilteringService {
*/
@Test
public void testIrrelevantSstFileDeletion()
- throws IOException, InterruptedException {
+ throws Exception {
RDBStore activeDbStore = (RDBStore) om.getMetadataManager().getStore();
SstFilteringService filteringService =
keyManager.getSnapshotSstFilteringService();
@@ -192,11 +191,7 @@ public class TestSstFilteringService {
SnapshotInfo snapshotInfo = om.getMetadataManager().getSnapshotInfoTable()
.get(SnapshotInfo.getTableKey(volumeName, bucketName2, snapshotName1));
assertFalse(snapshotInfo.isSstFiltered());
- with().atMost(Duration.ofSeconds(120))
- .pollInterval(Duration.ofSeconds(1))
- .await()
- .until(() -> filteringService.getSnapshotFilteredCount().get() >= 1);
-
+ waitForSnapshotsAtLeast(filteringService, 1);
assertEquals(1, filteringService.getSnapshotFilteredCount().get());
Set<String> keysFromActiveDb = getKeysFromDb(om.getMetadataManager(),
@@ -225,26 +220,18 @@ public class TestSstFilteringService {
assertTrue(snapshotInfo.isSstFiltered());
String snapshotName2 = "snapshot2";
- long count;
+ final long count;
try (BootstrapStateHandler.Lock lock =
filteringService.getBootstrapStateLock().lock()) {
count = filteringService.getSnapshotFilteredCount().get();
writeClient.createSnapshot(volumeName, bucketName2, snapshotName2);
- assertThrows(ConditionTimeoutException.class, () -> with()
- .atMost(Duration.ofSeconds(10))
- .pollInterval(Duration.ofSeconds(1))
- .await()
- .until(() ->
- filteringService.getSnapshotFilteredCount().get() > count));
-
+ assertThrows(TimeoutException.class,
+ () -> waitForSnapshotsAtLeast(filteringService, count + 1));
assertEquals(count, filteringService.getSnapshotFilteredCount().get());
}
- with().atMost(Duration.ofSeconds(10))
- .pollInterval(Duration.ofSeconds(1))
- .await()
- .until(() -> filteringService.getSnapshotFilteredCount().get() >
count);
+ waitForSnapshotsAtLeast(filteringService, count + 1);
Set<String> keysFromActiveDb2 = getKeysFromDb(om.getMetadataManager(),
volumeName, bucketName2);
@@ -254,7 +241,7 @@ public class TestSstFilteringService {
}
@Test
- public void testActiveAndDeletedSnapshotCleanup() throws IOException {
+ public void testActiveAndDeletedSnapshotCleanup() throws Exception {
RDBStore activeDbStore = (RDBStore) om.getMetadataManager().getStore();
String volumeName = "volume1";
List<String> bucketNames = Arrays.asList("bucket1", "bucket2");
@@ -295,8 +282,7 @@ public class TestSstFilteringService {
File snap2Current = new File(snapshot2Dir, "CURRENT");
// wait till both checkpoints are created
- with().atMost(Duration.ofSeconds(10)).pollInterval(Duration.ofSeconds(1))
- .await().until(() -> snap1Current.exists() && snap2Current.exists());
+ await(10_000, 1_000, () -> snap1Current.exists() && snap2Current.exists());
long snap1SstFileCountBeforeFilter =
Arrays.stream(snapshot1Dir.listFiles())
.filter(f -> f.getName().endsWith(".sst")).count();
@@ -307,9 +293,7 @@ public class TestSstFilteringService {
writeClient.deleteSnapshot(volumeName, bucketNames.get(0), "snap1");
sstFilteringService.resume();
// Filtering service will only act on snap2 as it is an active snaphot
- with().atMost(Duration.ofSeconds(10)).pollInterval(Duration.ofSeconds(1))
- .await()
- .until(() -> sstFilteringService.getSnapshotFilteredCount().get() >=
2);
+ waitForSnapshotsAtLeast(sstFilteringService, 2);
long snap1SstFileCountAfterFilter = Arrays.stream(snapshot1Dir.listFiles())
.filter(f -> f.getName().endsWith(SST_FILE_EXTENSION)).count();
long snap2SstFileCountAfterFilter = Arrays.stream(snapshot2Dir.listFiles())
@@ -383,7 +367,7 @@ public class TestSstFilteringService {
* snapshot bucket.
*/
@Test
- public void testSstFilteringService() throws IOException {
+ public void testSstFilteringService() throws Exception {
RDBStore activeDbStore = (RDBStore) om.getMetadataManager().getStore();
String volumeName = "volume";
List<String> bucketNames = Arrays.asList("bucket", "bucket1", "bucket2");
@@ -431,10 +415,7 @@ public class TestSstFilteringService {
SstFilteringService sstFilteringService =
keyManager.getSnapshotSstFilteringService();
- with().atMost(Duration.ofSeconds(10))
- .pollInterval(Duration.ofSeconds(1))
- .await()
- .until(() -> sstFilteringService.getSnapshotFilteredCount().get() >=
3);
+ waitForSnapshotsAtLeast(sstFilteringService, 3);
assertEquals(3, sstFilteringService.getSnapshotFilteredCount().get());
Set<String> keyInBucketAfterFilteringRun =
@@ -451,6 +432,11 @@ public class TestSstFilteringService {
assertEquals(keyInBucket2, keyInBucket2AfterFilteringRun);
}
+ private static void waitForSnapshotsAtLeast(SstFilteringService
filteringService, long n)
+ throws Exception {
+ await(10_000, 1_000, () ->
filteringService.getSnapshotFilteredCount().get() >= n);
+ }
+
private Set<String> getKeysFromDb(OMMetadataManager omMetadataReader,
String volume,
String bucket) throws IOException {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
index 54d0a116ef..57a27468b0 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
@@ -70,7 +70,7 @@ import org.apache.ozone.rocksdiff.RocksDBCheckpointDiffer;
import org.apache.ozone.rocksdiff.RocksDiffUtils;
import org.apache.ozone.test.tag.Unhealthy;
import org.apache.ratis.util.ExitUtils;
-import org.awaitility.Awaitility;
+import org.apache.ratis.util.TimeDuration;
import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
@@ -155,6 +155,7 @@ import static
org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.FA
import static
org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.IN_PROGRESS;
import static
org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.QUEUED;
import static
org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.REJECTED;
+import static org.apache.ratis.util.JavaUtils.attempt;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -1310,15 +1311,13 @@ public class TestSnapshotDiffManager {
spy.loadJobsOnStartUp();
// Wait for sometime to make sure that job finishes.
- Awaitility.await()
- .atMost(10, TimeUnit.SECONDS)
- .untilAsserted(() -> {
- verify(spy, atLeast(1))
- .generateSnapshotDiffReport(anyString(), anyString(),
- eq(VOLUME_NAME), eq(BUCKET_NAME), eq(snapshotInfo.getName()),
- eq(snapshotInfoList.get(1).getName()), eq(false),
- eq(false));
- });
+ attempt(() ->
+ verify(spy, atLeast(1))
+ .generateSnapshotDiffReport(anyString(), anyString(),
+ eq(VOLUME_NAME), eq(BUCKET_NAME), eq(snapshotInfo.getName()),
+ eq(snapshotInfoList.get(1).getName()), eq(false),
+ eq(false)),
+ 10, TimeDuration.ONE_SECOND, null, null);
SnapshotDiffJob snapDiffJob = getSnapshotDiffJobFromDb(snapshotInfo,
snapshotInfoList.get(1));
diff --git a/pom.xml b/pom.xml
index 7c89d5ca59..57e611908f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,6 +218,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<okhttp.version>2.7.5</okhttp.version>
<okio.version>3.6.0</okio.version>
<mockito2.version>3.5.9</mockito2.version>
+ <hamcrest.version>2.2</hamcrest.version>
<jmockit.version>1.24</jmockit.version>
<junit4.version>4.13.1</junit4.version>
<junit5.version>5.10.1</junit5.version>
@@ -297,7 +298,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<aspectj.version>1.9.7</aspectj.version>
<aspectj-plugin.version>1.14.0</aspectj-plugin.version>
<restrict-imports.enforcer.version>2.4.0</restrict-imports.enforcer.version>
- <awaitility.version>4.2.0</awaitility.version>
<bzip2.version>1.0.8</bzip2.version>
<zlib.version>1.2.13</zlib.version>
<lz4.version>1.9.3</lz4.version>
@@ -1166,6 +1166,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <version>${hamcrest.version}</version>
+ </dependency>
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.core</artifactId>
@@ -1488,11 +1493,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<artifactId>sqlite-jdbc</artifactId>
<version>${sqlite.version}</version>
</dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <version>${awaitility.version}</version>
- </dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
