Pin grgit to known-working and findable version with the versions of Nebula/Gradle/Java in place. Fix not-found imports in tests. (#1135)

Author: mattl-netflix

build.gradle

@@ -1,3 +1,11 @@
+buildscript {
+  configurations.classpath {
+    resolutionStrategy {
+      force "org.ajoberstar.grgit:grgit-core:4.1.1"
+    }
+  }
+}
+
 plugins {
     id 'nebula.netflixoss' version '9.1.0'
     id 'com.github.sherter.google-java-format' version '0.8'

priam/src/test/java/com/netflix/priam/backup/TestBackupDynamicRateLimiter.java

@@ -14,9 +14,9 @@
 import java.time.ZoneId;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 
 public class TestBackupDynamicRateLimiter {
     private static final Instant NOW = Instant.ofEpochMilli(1 << 16);
@@ -76,15 +76,15 @@ public void targetIsInThePast() {
     @Test
     public void noBackupThreads() {
         rateLimiter = getRateLimiter(ImmutableMap.of("Priam.backup.threads", 0), NOW, DIR_SIZE);
-        Assert.assertThrows(
+        Assertions.assertThrows(
                 IllegalStateException.class,
                 () -> timePermitAcquisition(getBackupPath(), LATER, 20));
     }
 
     @Test
     public void negativeBackupThreads() {
         rateLimiter = getRateLimiter(ImmutableMap.of("Priam.backup.threads", -1), NOW, DIR_SIZE);
-        Assert.assertThrows(
+        Assertions.assertThrows(
                 IllegalStateException.class,
                 () -> timePermitAcquisition(getBackupPath(), LATER, 20));
     }
@@ -99,15 +99,15 @@ public void noData() {
     @Test
     public void noPermitsRequested() {
         rateLimiter = getRateLimiter(ImmutableMap.of("Priam.backup.threads", 1), NOW, DIR_SIZE);
-        Assert.assertThrows(
+        Assertions.assertThrows(
                 IllegalArgumentException.class,
                 () -> timePermitAcquisition(getBackupPath(), LATER, 0));
     }
 
     @Test
     public void negativePermitsRequested() {
         rateLimiter = getRateLimiter(ImmutableMap.of("Priam.backup.threads", 1), NOW, DIR_SIZE);
-        Assert.assertThrows(
+        Assertions.assertThrows(
                 IllegalArgumentException.class,
                 () -> timePermitAcquisition(getBackupPath(), LATER, -1));
     }

priam/src/test/java/com/netflix/priam/identity/token/TokenRetrieverTest.java

@@ -41,7 +41,6 @@
 import mockit.Mocked;
 import org.apache.commons.lang3.math.Fraction;
 import org.codehaus.jettison.json.JSONObject;
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 
@@ -429,7 +428,7 @@ public void testRingPositionLast(@Mocked SystemUtils systemUtils) throws Excepti
     public void testThrowOnDuplicateTokenInSameRegion() {
         prepareTokenGenerationTest();
         create(1, instanceInfo.getInstanceId(), "host_0", "1.2.3.4", "us-east-1d", 1808575600 + "");
-        Assert.assertThrows(
+        Assertions.assertThrows(
                 IllegalStateException.class, () -> getTokenRetriever().generateNewToken());
     }
 

priam/src/test/java/com/netflix/priam/scheduler/TestSimpleTimer.java

@@ -5,8 +5,8 @@
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
-import org.junit.Assert;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.quartz.Trigger;
 
 public class TestSimpleTimer {
@@ -20,7 +20,7 @@ public void sunnyDay() throws ParseException {
 
     @Test
     public void startBeforeEpoch() {
-        Assert.assertThrows(
+        Assertions.assertThrows(
                 IllegalArgumentException.class,
                 () -> new SimpleTimer("foo", PERIOD, Instant.EPOCH.minus(5, ChronoUnit.SECONDS)));
     }
@@ -38,13 +38,14 @@ public void startMoreThanOnePeriodAfterEpoch() throws ParseException {
 
     @Test
     public void negativePeriod() {
-        Assert.assertThrows(
+        Assertions.assertThrows(
                 IllegalArgumentException.class, () -> new SimpleTimer("foo", -PERIOD, START));
     }
 
     @Test
     public void zeroPeriod() {
-        Assert.assertThrows(IllegalArgumentException.class, () -> new SimpleTimer("foo", 0, START));
+        Assertions.assertThrows(
+                IllegalArgumentException.class, () -> new SimpleTimer("foo", 0, START));
     }
 
     private void assertions(Trigger trigger, Instant start) {

settings.gradle

@@ -1,2 +1,9 @@
+pluginManagement {
+  repositories {
+    gradlePluginPortal()
+    mavenCentral()
+  }
+}
+
 rootProject.name = 'Priam'
 include 'priam','priam-web','priam-cass-extensions','priam-dse-extensions'