diff --git a/build.gradle b/build.gradle index 75d02da7b..235456d31 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { - ext.pegasusVersion = '28.3.7' - ext.junitJupiterVersion = '5.6.1' + ext.pegasusVersion = '29.6.9' + ext.junitJupiterVersion = '5.8.2' apply from: './repositories.gradle' buildscript.repositories.addAll(project.repositories) @@ -34,20 +34,20 @@ project.ext.spec = [ project.ext.externalDependency = [ 'assertJ': 'org.assertj:assertj-core:3.11.1', - 'commonsIo': 'commons-io:commons-io:2.4', + 'commonsIo': 'commons-io:commons-io:2.16.1', 'commonsLang': 'commons-lang:commons-lang:2.6', 'caffeine': 'com.github.ben-manes.caffeine:caffeine:2.9.2', 'ebean': 'io.ebean:ebean:11.33.3', 'ebeanAgent': 'io.ebean:ebean-agent:11.27.1', 'elasticSearchRest': 'org.elasticsearch.client:elasticsearch-rest-high-level-client:5.6.8', 'elasticSearchTransport': 'org.elasticsearch.client:transport:5.6.8', - 'elasticSearchRest7': 'org.elasticsearch.client:elasticsearch-rest-high-level-client:7.9.3', - 'elasticSearchTransport7': 'org.elasticsearch.client:transport:7.9.3', + 'elasticSearchRest7': 'org.elasticsearch.client:elasticsearch-rest-high-level-client:7.17.24', + 'elasticSearchTransport7': 'org.elasticsearch.client:transport:7.17.24', 'flywayCore': 'org.flywaydb:flyway-core:7.15.0', - 'guava': 'com.google.guava:guava:27.0.1-jre', + 'guava': 'com.google.guava:guava:32.0.0-jre', 'h2': 'com.h2database:h2:1.4.196', - 'jacksonCore': 'com.fasterxml.jackson.core:jackson-core:2.9.7', - 'jacksonDataBind': 'com.fasterxml.jackson.core:jackson-databind:2.9.7', + 'jacksonCore': 'com.fasterxml.jackson.core:jackson-core:2.17.2', + 'jacksonDataBind': 'com.fasterxml.jackson.core:jackson-databind:2.17.2', 'javatuples': 'org.javatuples:javatuples:1.2', 'jsonSimple': 'com.googlecode.json-simple:json-simple:1.1.1', 'junitJupiterApi': "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion", @@ -55,18 +55,18 @@ project.ext.externalDependency = [ 'junitJupiterEngine': "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion", 'junitVintageEngine': "org.junit.vintage:junit-vintage-engine:$junitJupiterVersion", 'log4j': 'org.apache.logging.log4j:log4j-slf4j-impl:2.18.0', - 'lombok': 'org.projectlombok:lombok:1.18.22', - 'lombokAnnotationProcessor': 'org.projectlombok:lombok:1.18.22', + 'lombok': 'org.projectlombok:lombok:1.18.30', + 'lombokAnnotationProcessor': 'org.projectlombok:lombok:1.18.30', 'maria4j': 'ch.vorburger.mariaDB4j:mariaDB4j:2.5.3', - 'mockito': 'org.mockito:mockito-core:3.0.0', + 'mockito': 'org.mockito:mockito-core:4.11.0', 'mockitoInline': 'org.mockito:mockito-inline:3.11.2', 'mysql': 'mysql:mysql-connector-java:8.0.29', 'neo4jHarness': 'org.neo4j.test:neo4j-harness:3.4.11', 'neo4jJavaDriver': 'org.neo4j.driver:neo4j-java-driver:4.0.0', - 'parseqTest': 'com.linkedin.parseq:parseq:3.0.7:test', + 'parseqTest': 'com.linkedin.parseq:parseq-test-api:5.1.20', 'postgresql': 'org.postgresql:postgresql:42.2.14', 'reflections': 'org.reflections:reflections:0.9.11', - 'rythmEngine': 'org.rythmengine:rythm-engine:1.3.0', + 'rythmEngine': 'org.rythmengine:rythm-engine:1.4.2', 'spock': 'org.spockframework:spock-core:1.3-groovy-2.4', 'testContainers': 'org.testcontainers:testcontainers:1.15.1', 'testContainersJunit': 'org.testcontainers:junit-jupiter:1.15.1', diff --git a/dao-impl/elasticsearch-dao-7/src/main/java/com/linkedin/metadata/dao/search/ESBulkWriterDAO.java b/dao-impl/elasticsearch-dao-7/src/main/java/com/linkedin/metadata/dao/search/ESBulkWriterDAO.java index ac92f4710..6eb82d05a 100644 --- a/dao-impl/elasticsearch-dao-7/src/main/java/com/linkedin/metadata/dao/search/ESBulkWriterDAO.java +++ b/dao-impl/elasticsearch-dao-7/src/main/java/com/linkedin/metadata/dao/search/ESBulkWriterDAO.java @@ -8,7 +8,7 @@ import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.update.UpdateRequest; -import org.elasticsearch.common.xcontent.XContentType; +import org.elasticsearch.xcontent.XContentType; /** diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5028f28f8..53b9e3802 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/restli-resources/src/test/java/com/linkedin/metadata/restli/BaseAspectRoutingResourceTest.java b/restli-resources/src/test/java/com/linkedin/metadata/restli/BaseAspectRoutingResourceTest.java index 12199a2f3..a196389ee 100644 --- a/restli-resources/src/test/java/com/linkedin/metadata/restli/BaseAspectRoutingResourceTest.java +++ b/restli-resources/src/test/java/com/linkedin/metadata/restli/BaseAspectRoutingResourceTest.java @@ -216,7 +216,7 @@ public void testGetWithoutRoutingAspect() { EntityValue value = runAndWait(_resource.get(makeResourceKey(urn), new String[]{AspectBar.class.getCanonicalName()})); assertFalse(value.hasFoo()); - verifyZeroInteractions(_mockAspectFooGmsClient); + verifyNoInteractions(_mockAspectFooGmsClient); assertTrue(value.hasBar()); assertEquals(value.getBar(), bar); @@ -338,7 +338,7 @@ public void testIngestWithoutRoutingAspect() { runAndWait(_resource.ingest(snapshot)); verify(_mockLocalDAO, times(1)).add(eq(urn), eq(bar), any(), eq(null), eq(null)); - verifyZeroInteractions(_mockAspectFooGmsClient); + verifyNoInteractions(_mockAspectFooGmsClient); verifyNoMoreInteractions(_mockLocalDAO); } @@ -415,7 +415,7 @@ public void testGetSnapshotWithOnlyRoutingAspect() { assertEquals(snapshot.getUrn(), urn); assertEquals(aspects, ImmutableSet.of(foo, attributes)); - verifyZeroInteractions(_mockLocalDAO); + verifyNoInteractions(_mockLocalDAO); } @Test @@ -484,9 +484,9 @@ public void testBackfillWithoutRoutingAspect() { new String[]{AspectBar.class.getCanonicalName()})); assertEquals(backfillResult.getEntities().size(), 2); - verifyZeroInteractions(_mockAspectFooGmsClient); + verifyNoInteractions(_mockAspectFooGmsClient); - verifyZeroInteractions(_mockAspectBazGmsClient); + verifyNoInteractions(_mockAspectBazGmsClient); } @Test @@ -548,7 +548,7 @@ public void testBackfillWithNewValue() { new String[]{AspectBar.class.getCanonicalName(), AspectFoo.class.getCanonicalName()})); assertEquals(backfillResult.getEntities().size(), 2); - verifyZeroInteractions(_mockAspectFooGmsClient); + verifyNoInteractions(_mockAspectFooGmsClient); } @Test diff --git a/testing/elasticsearch-dao-integ-testing-7/src/main/java/com/linkedin/metadata/testing/SearchIndex.java b/testing/elasticsearch-dao-integ-testing-7/src/main/java/com/linkedin/metadata/testing/SearchIndex.java index c4a274743..bd7c3d5ad 100644 --- a/testing/elasticsearch-dao-integ-testing-7/src/main/java/com/linkedin/metadata/testing/SearchIndex.java +++ b/testing/elasticsearch-dao-integ-testing-7/src/main/java/com/linkedin/metadata/testing/SearchIndex.java @@ -16,7 +16,7 @@ import org.elasticsearch.action.bulk.BulkProcessor; import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.indices.PutMappingRequest; -import org.elasticsearch.common.xcontent.XContentType; +import org.elasticsearch.xcontent.XContentType; /** diff --git a/testing/elasticsearch-dao-integ-testing-7/src/main/java/com/linkedin/metadata/testing/SearchIndexFactory.java b/testing/elasticsearch-dao-integ-testing-7/src/main/java/com/linkedin/metadata/testing/SearchIndexFactory.java index 5d920e2b8..fa4ab2bc3 100644 --- a/testing/elasticsearch-dao-integ-testing-7/src/main/java/com/linkedin/metadata/testing/SearchIndexFactory.java +++ b/testing/elasticsearch-dao-integ-testing-7/src/main/java/com/linkedin/metadata/testing/SearchIndexFactory.java @@ -6,7 +6,7 @@ import javax.annotation.Nullable; import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.indices.CreateIndexRequest; -import org.elasticsearch.common.xcontent.XContentType; +import org.elasticsearch.xcontent.XContentType; /**