From 6558295ea3bb9f5b928e46931d9f27443e02ee9f Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Mon, 30 Nov 2020 09:43:41 -0500 Subject: [PATCH] chore: update dependencies --- .../build.gradle.kts | 1 + .../core/graphql/impl/GraphQlFactory.java | 1 + .../build.gradle.kts | 40 +++++++++---------- .../build.gradle.kts | 8 ++-- .../build.gradle.kts | 4 +- 5 files changed, 28 insertions(+), 26 deletions(-) diff --git a/hypertrace-core-graphql-grpc-utils/build.gradle.kts b/hypertrace-core-graphql-grpc-utils/build.gradle.kts index 2ba7999a..caec07e0 100644 --- a/hypertrace-core-graphql-grpc-utils/build.gradle.kts +++ b/hypertrace-core-graphql-grpc-utils/build.gradle.kts @@ -16,6 +16,7 @@ dependencies { implementation("org.hypertrace.core.grpcutils:grpc-client-utils") implementation("io.grpc:grpc-context") implementation("io.reactivex.rxjava3:rxjava") + implementation("org.slf4j:slf4j-api") implementation(project(":hypertrace-core-graphql-spi")) testImplementation("org.junit.jupiter:junit-jupiter") diff --git a/hypertrace-core-graphql-impl/src/main/java/org/hypertrace/core/graphql/impl/GraphQlFactory.java b/hypertrace-core-graphql-impl/src/main/java/org/hypertrace/core/graphql/impl/GraphQlFactory.java index 56d1287e..be4bd3de 100644 --- a/hypertrace-core-graphql-impl/src/main/java/org/hypertrace/core/graphql/impl/GraphQlFactory.java +++ b/hypertrace-core-graphql-impl/src/main/java/org/hypertrace/core/graphql/impl/GraphQlFactory.java @@ -15,6 +15,7 @@ public static GraphQLConfiguration build( 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(); } diff --git a/hypertrace-core-graphql-platform/build.gradle.kts b/hypertrace-core-graphql-platform/build.gradle.kts index ff0f236d..ae081976 100644 --- a/hypertrace-core-graphql-platform/build.gradle.kts +++ b/hypertrace-core-graphql-platform/build.gradle.kts @@ -5,31 +5,31 @@ plugins { dependencies { constraints { - api("org.hypertrace.core.grpcutils:grpc-context-utils:0.3.0") - api("org.hypertrace.core.grpcutils:grpc-client-utils:0.3.0") - api("org.hypertrace.gateway.service:gateway-service-api:0.1.1") - api("org.hypertrace.core.attribute.service:attribute-service-api:0.6.0") + api("org.hypertrace.core.grpcutils:grpc-context-utils:0.3.2") + api("org.hypertrace.core.grpcutils:grpc-client-utils:0.3.2") + api("org.hypertrace.gateway.service:gateway-service-api:0.1.38") + api("org.hypertrace.core.attribute.service:attribute-service-api:0.8.7") api("com.google.inject:guice:4.2.3") - api("com.graphql-java:graphql-java:14.0") - api("io.github.graphql-java:graphql-java-annotations:8.0") - api("org.slf4j:slf4j-api:1.7.3") - api("io.reactivex.rxjava3:rxjava:3.0.2") - api("com.google.protobuf:protobuf-java-util:3.11.4") - api("org.projectlombok:lombok:1.18.12") + api("com.graphql-java:graphql-java:15.0") + api("io.github.graphql-java:graphql-java-annotations:8.3") + api("org.slf4j:slf4j-api:1.7.30") + api("io.reactivex.rxjava3:rxjava:3.0.7") + api("com.google.protobuf:protobuf-java-util:3.14.0") + api("org.projectlombok:lombok:1.18.16") api("com.google.code.findbugs:jsr305:3.0.2") - api("com.typesafe:config:1.4.0") + api("com.typesafe:config:1.4.1") api("com.google.guava:guava:30.0-jre") - api("com.graphql-java-kickstart:graphql-java-servlet:9.1.0") - api("io.grpc:grpc-api:1.33.0") - api("io.grpc:grpc-core:1.33.0") - api("io.grpc:grpc-stub:1.33.0") - api("io.grpc:grpc-context:1.33.0") - api("com.fasterxml.jackson.core:jackson-databind:2.11.0") - api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.0") + api("com.graphql-java-kickstart:graphql-java-servlet:10.0.0") + api("io.grpc:grpc-api:1.33.1") + api("io.grpc:grpc-core:1.33.1") + api("io.grpc:grpc-stub:1.33.1") + api("io.grpc:grpc-context:1.33.1") + api("com.fasterxml.jackson.core:jackson-databind:2.12.0") + api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.0") - runtime("org.apache.logging.log4j:log4j-slf4j-impl:2.13.3") - runtime("io.grpc:grpc-netty:1.33.0") + runtime("org.apache.logging.log4j:log4j-slf4j-impl:2.14.0") + runtime("io.grpc:grpc-netty:1.33.1") runtime("io.netty:netty-codec-http2:4.1.53.Final") { because("https://snyk.io/vuln/SNYK-JAVA-IONETTY-1020439") } diff --git a/hypertrace-core-graphql-service/build.gradle.kts b/hypertrace-core-graphql-service/build.gradle.kts index bc94135a..8adb28b7 100644 --- a/hypertrace-core-graphql-service/build.gradle.kts +++ b/hypertrace-core-graphql-service/build.gradle.kts @@ -9,12 +9,12 @@ dependencies { implementation(platform(project(":hypertrace-core-graphql-platform"))) implementation("com.typesafe:config") - implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.15") + implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.18") implementation("org.slf4j:slf4j-api") - implementation("org.eclipse.jetty:jetty-server:9.4.30.v20200611") - implementation("org.eclipse.jetty:jetty-servlet:9.4.30.v20200611") - implementation("org.eclipse.jetty:jetty-servlets:9.4.30.v20200611") + 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("com.graphql-java-kickstart:graphql-java-servlet") implementation(project(":hypertrace-core-graphql-impl")) diff --git a/hypertrace-core-graphql-test-platform/build.gradle.kts b/hypertrace-core-graphql-test-platform/build.gradle.kts index 7fc9cfe8..83bee8ad 100644 --- a/hypertrace-core-graphql-test-platform/build.gradle.kts +++ b/hypertrace-core-graphql-test-platform/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { constraints { api("org.junit.jupiter:junit-jupiter:5.7.0") - api("org.mockito:mockito-core:3.5.13") - api("org.mockito:mockito-junit-jupiter:3.5.13") + api("org.mockito:mockito-core:3.6.28") + api("org.mockito:mockito-junit-jupiter:3.6.28") } } \ No newline at end of file