From bab5acc5e37ba4ce6738bc6af2885c4b48738532 Mon Sep 17 00:00:00 2001
From: Shirshanka Das <shirshanka@apache.org>
Date: Sun, 2 Oct 2022 19:35:10 -0700
Subject: [PATCH] chore(deps): upgrade graphql-java deps to 19.0 (#6099)

---
 build.gradle                                                  | 4 +++-
 datahub-graphql-core/build.gradle                             | 3 ++-
 .../java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 55a4eca1a1..6965c8e773 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,7 @@ buildscript {
   ext.mavenVersion = '3.6.3'
   ext.springVersion = '5.3.20'
   ext.springBootVersion = '2.5.12'
+  ext.graphQLJavaVersion = '19.0'
   apply from: './repositories.gradle'
   buildscript.repositories.addAll(project.repositories)
   dependencies {
@@ -66,7 +67,8 @@ project.ext.externalDependency = [
     'elasticSearchRest': 'org.elasticsearch.client:elasticsearch-rest-high-level-client:7.9.3',
     'elasticSearchTransport': 'org.elasticsearch.client:transport:7.9.3',
     'findbugsAnnotations': 'com.google.code.findbugs:annotations:3.0.1',
-    'graphqlJava': 'com.graphql-java:graphql-java:16.1',
+    'graphqlJava': 'com.graphql-java:graphql-java:' + graphQLJavaVersion,
+    'graphqlJavaScalars': 'com.graphql-java:graphql-java-extended-scalars:' + graphQLJavaVersion,
     'gson': 'com.google.code.gson:gson:2.8.9',
     'guice': 'com.google.inject:guice:4.2.2',
     'guava': 'com.google.guava:guava:27.0.1-jre',
diff --git a/datahub-graphql-core/build.gradle b/datahub-graphql-core/build.gradle
index 62d77f03bb..aa13ce05d7 100644
--- a/datahub-graphql-core/build.gradle
+++ b/datahub-graphql-core/build.gradle
@@ -9,7 +9,8 @@ dependencies {
     compile project(':metadata-io')
     compile project(':metadata-utils')
 
-    compile externalDependency.graphqlJava
+    implementation externalDependency.graphqlJava
+    implementation externalDependency.graphqlJavaScalars
     compile externalDependency.antlr4Runtime
     compile externalDependency.antlr4
     compile externalDependency.guava
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
index c292c0cd3a..db9f999a2b 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
@@ -282,7 +282,7 @@ import org.dataloader.DataLoaderOptions;
 
 import static com.linkedin.datahub.graphql.Constants.*;
 import static com.linkedin.metadata.Constants.*;
-import static graphql.Scalars.*;
+import static graphql.scalars.ExtendedScalars.*;
 
 
 /**