chore: update dependencies

Author: aaron-steinfeld

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-  id("org.hypertrace.repository-plugin") version "0.2.0"
-  id("org.hypertrace.ci-utils-plugin") version "0.1.1"
-  id("org.hypertrace.jacoco-report-plugin") version "0.1.0" apply false
+  id("org.hypertrace.repository-plugin") version "0.2.3"
+  id("org.hypertrace.ci-utils-plugin") version "0.2.0"
+  id("org.hypertrace.jacoco-report-plugin") version "0.1.3" apply false
   id("org.hypertrace.docker-java-application-plugin") version "0.8.1" apply false
   id("org.hypertrace.docker-publish-plugin") version "0.8.1" apply false
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

hypertrace-core-graphql

@@ -14,9 +14,6 @@ public static GraphQLConfiguration build(
     final Injector injector = Guice.createInjector(new GraphQlModule(config, serviceLifecycle));
 
     return GraphQLConfiguration.with(injector.getInstance(GraphQLSchema.class))
-        .with(config.isAsyncServlet())
-        .asyncTimeout(
-            30000) // https://github.com/graphql-java-kickstart/graphql-java-servlet/issues/282
         .with(injector.getInstance(GraphQlRequestContextBuilder.class))
         .build();
   }

hypertrace-graphql-impl/src/main/java/org/hypertrace/graphql/impl/GraphQlFactory.java

@@ -9,7 +9,7 @@ javaPlatform {
 dependencies {
   api(platform("org.hypertrace.core.graphql:hypertrace-core-graphql-platform"))
   constraints {
-    api("org.hypertrace.entity.service:entity-type-service-rx-client:0.2.0")
-    api("org.hypertrace.config.service:spaces-config-service-api:0.1.0")
+    api("org.hypertrace.entity.service:entity-type-service-rx-client:0.5.6")
+    api("org.hypertrace.config.service:spaces-config-service-api:0.1.1")
   }
 }

hypertrace-graphql-platform/build.gradle.kts

@@ -7,12 +7,12 @@ plugins {
 
 dependencies {
   implementation("com.typesafe:config")
-  implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.18")
+  implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.20")
   implementation("org.slf4j:slf4j-api")
 
-  implementation("org.eclipse.jetty:jetty-server:9.4.35.v20201120")
-  implementation("org.eclipse.jetty:jetty-servlet:9.4.35.v20201120")
-  implementation("org.eclipse.jetty:jetty-servlets:9.4.35.v20201120")
+  implementation("org.eclipse.jetty:jetty-server:9.4.36.v20210114")
+  implementation("org.eclipse.jetty:jetty-servlet:9.4.36.v20210114")
+  implementation("org.eclipse.jetty:jetty-servlets:9.4.36.v20210114")
 
   implementation("com.graphql-java-kickstart:graphql-java-servlet")
   implementation(project(":hypertrace-graphql-impl"))

hypertrace-graphql-service/build.gradle.kts

@@ -13,7 +13,6 @@ class DefaultGraphQlServiceConfig implements HypertraceGraphQlServiceConfig {
   private static final String SERVICE_PORT_CONFIG = "service.port";
 
   private static final String GRAPHQL_URL_PATH = "graphql.urlPath";
-  private static final String GRAPHQL_ASYNC_SERVLET = "graphql.asyncServlet";
   private static final String GRAPHQL_CORS_ENABLED = "graphql.corsEnabled";
 
   private static final String DEFAULT_TENANT_ID = "defaultTenantId";
@@ -35,7 +34,6 @@ class DefaultGraphQlServiceConfig implements HypertraceGraphQlServiceConfig {
   String serviceName;
   int servicePort;
   String graphqlUrlPath;
-  boolean asyncServlet;
   boolean corsEnabled;
   Optional<String> defaultTenantId;
   int maxIoThreads;
@@ -52,7 +50,6 @@ class DefaultGraphQlServiceConfig implements HypertraceGraphQlServiceConfig {
     this.serviceName = untypedConfig.getString(SERVICE_NAME_CONFIG);
     this.servicePort = untypedConfig.getInt(SERVICE_PORT_CONFIG);
     this.graphqlUrlPath = untypedConfig.getString(GRAPHQL_URL_PATH);
-    this.asyncServlet = untypedConfig.getBoolean(GRAPHQL_ASYNC_SERVLET);
     this.corsEnabled = untypedConfig.getBoolean(GRAPHQL_CORS_ENABLED);
     this.defaultTenantId = optionallyGet(() -> untypedConfig.getString(DEFAULT_TENANT_ID));
     this.maxIoThreads = untypedConfig.getInt(MAX_IO_THREADS_PROPERTY);

hypertrace-graphql-service/src/main/java/org/hypertrace/graphql/service/DefaultGraphQlServiceConfig.java

@@ -4,7 +4,6 @@ service.port = 23431 #TODO resolve with existing graphql port when ready for dep
 service.admin.port = 23432
 
 graphql.urlPath = /graphql
-graphql.asyncServlet = true
 graphql.corsEnabled = true
 
 defaultTenantId = ${?DEFAULT_TENANT_ID}

hypertrace-graphql-service/src/main/resources/configs/common/application.conf

@@ -9,7 +9,7 @@ pluginManagement {
 }
 
 plugins {
-  id("org.hypertrace.version-settings") version "0.1.1"
+  id("org.hypertrace.version-settings") version "0.1.6"
 }
 
 includeBuild("./hypertrace-core-graphql")