This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch dependency/graphql in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 09e313f6ccc0cb6b1785f2a5b5e4cb7b3d91ed82 Author: kezhenxu94 <[email protected]> AuthorDate: Wed Jan 19 15:46:50 2022 +0800 Bump up GraphQL related dependencies --- dist-material/release-docs/LICENSE | 13 +++++++----- dist-material/release-docs/NOTICE | 17 +++++++++++++++ .../release-docs/licenses/LICENSE-reflectasm.txt | 10 --------- oap-server-bom/pom.xml | 14 +++++++++---- oap-server/oal-grammar/pom.xml | 2 +- .../query-graphql-plugin/pom.xml | 6 +++++- .../oap/query/graphql/GraphQLQueryProvider.java | 4 +++- .../query/graphql/resolver/AggregationQuery.java | 2 +- .../oap/query/graphql/resolver/AlarmQuery.java | 5 ++--- .../query/graphql/resolver/BrowserLogQuery.java | 2 +- .../oap/query/graphql/resolver/EventQuery.java | 2 +- .../oap/query/graphql/resolver/HealthQuery.java | 2 +- .../oap/query/graphql/resolver/LogQuery.java | 2 +- .../oap/query/graphql/resolver/LogTestQuery.java | 2 +- .../oap/query/graphql/resolver/MetadataQuery.java | 2 +- .../query/graphql/resolver/MetadataQueryV2.java | 2 +- .../oap/query/graphql/resolver/MetricQuery.java | 2 +- .../oap/query/graphql/resolver/MetricsQuery.java | 2 +- .../oap/query/graphql/resolver/Mutation.java | 2 +- .../query/graphql/resolver/ProfileMutation.java | 2 +- .../oap/query/graphql/resolver/ProfileQuery.java | 2 +- .../oap/query/graphql/resolver/Query.java | 2 +- .../query/graphql/resolver/TopNRecordsQuery.java | 2 +- .../oap/query/graphql/resolver/TopologyQuery.java | 2 +- .../oap/query/graphql/resolver/TraceQuery.java | 2 +- .../resolver/UIConfigurationManagement.java | 4 ++-- .../known-oap-backend-dependencies.txt | 24 ++++++++++++++-------- 27 files changed, 81 insertions(+), 52 deletions(-) diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index 6427efb..ab77bd0 100755 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -267,13 +267,17 @@ The text of each license is the standard Apache 2.0 license. jackson-core 2.12.2: https://github.com/FasterXML/jackson-core, Apache 2.0 jackson-databind 2.12.2: https://github.com/FasterXML/jackson-databind, Apache 2.0 jackson-datatype-jdk8 2.9.5: https://github.com/FasterXML/jackson-modules-java8/tree/jackson-modules-java8-2.8.8, Apache 2.0 - jackson-module-kotlin 2.8.8: http://kotlinlang.org, Apache 2.0 + jackson-module-kotlin 2.13.1: http://kotlinlang.org, Apache 2.0 jackson-module-afterburner 2.12.2: https://github.com/FasterXML/jackson-modules-base, Apache 2.0 - java-dataloader 2.0.1: https://github.com/graphql-java/java-dataloader, Apache 2.0 + java-dataloader 3.1.0: https://github.com/graphql-java/java-dataloader, Apache 2.0 kotlin-reflect 1.1.1: http://kotlinlang.org, Apache 2.0 kotlin-stdlib 1.1.60: http://kotlinlang.org, Apache 2.0 + kotlin-stdlib-common 1.1.60: http://kotlinlang.org, Apache 2.0 + kotlin-stdlib-jdk7-1.5.0 1.1.60: http://kotlinlang.org, Apache 2.0 + kotlin-stdlib-jdk8-1.5.0 1.1.60: http://kotlinlang.org, Apache 2.0 + kotlinx coroutines 1.5.0: https://github.com/Kotlin/kotlinx.coroutines, Apache 2.0 archaius-core 0.7.4: https://github.com/Netflix/archaius, Apache 2.0 - classmate 1.3.1: https://github.com/FasterXML/java-classmate, Apache 2.0 + classmate 1.5.1: https://github.com/FasterXML/java-classmate, Apache 2.0 hibernate-validator 5.3.6.Final: https://github.com/hibernate/hibernate-validator, Apache 2.0 hystrix 1.5.12: https://github.com/Netflix/Hystrix, Apache 2.0 javax.inject 1: http://central.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1.pom, Apache 2.0 @@ -366,10 +370,9 @@ The following components are provided under a BSD license. See project link for The text of each license is also included at licenses/LICENSE-[project].txt. asm 9.0:https://gitlab.ow2.org , BSD-3-Clause - antlr4-runtime 4.5.1: http://www.antlr.org/license.html, BSD-3-Clause + antlr4-runtime 4.9.2: http://www.antlr.org/license.html, BSD-3-Clause Google: protobuf-java 3.19.2: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause Google: protobuf-java-util 3.19.2: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause - reflectasm 1.11.7: https://github.com/EsotericSoftware/reflectasm , BSD-3-Clause zstd-jni 1.4.3-1: https://github.com/luben/zstd-jni, BSD-3-Clause postgresql 42.2.18: https://jdbc.postgresql.org/about/license.html, BSD-2-Clause diff --git a/dist-material/release-docs/NOTICE b/dist-material/release-docs/NOTICE index 7e9f934..448d394 100755 --- a/dist-material/release-docs/NOTICE +++ b/dist-material/release-docs/NOTICE @@ -910,3 +910,20 @@ This product includes software developed at CoreOS, Inc. (http://www.coreos.com/). =========================================================================== + +------ + +=========================================================================== +graphql-java-tools Notice +=========================================================================== + +Copyright (C) 2017, Cox Automotive, Inc. +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +=========================================================================== diff --git a/dist-material/release-docs/licenses/LICENSE-reflectasm.txt b/dist-material/release-docs/licenses/LICENSE-reflectasm.txt deleted file mode 100644 index 3f6a160..0000000 --- a/dist-material/release-docs/licenses/LICENSE-reflectasm.txt +++ /dev/null @@ -1,10 +0,0 @@ -Copyright (c) 2008, Nathan Sweet -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Esoteric Software nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROF [...] \ No newline at end of file diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml index 3234aad..42fe2eb 100644 --- a/oap-server-bom/pom.xml +++ b/oap-server-bom/pom.xml @@ -30,8 +30,9 @@ <properties> <slf4j.version>1.7.30</slf4j.version> <log4j.version>2.17.1</log4j.version> - <graphql-java-tools.version>5.2.3</graphql-java-tools.version> - <graphql-java.version>8.0</graphql-java.version> + <graphql-java-tools.version>12.0.2</graphql-java-tools.version> + <graphql-java.version>17.3</graphql-java.version> + <graphql-java-extended-scalars.version>17.0</graphql-java-extended-scalars.version> <okhttp.version>3.14.9</okhttp.version> <httpclient.version>4.5.13</httpclient.version> <h2.version>2.0.206</h2.version> @@ -62,7 +63,7 @@ <etcd4j.version>2.18.0</etcd4j.version> <netty.version>4.1.68.Final</netty.version> <jackson-module-afterburner.version>2.12.2</jackson-module-afterburner.version> - <antlr.version>4.7.1</antlr.version> + <antlr.version>4.9.2</antlr.version> <freemarker.version>2.3.28</freemarker.version> <javaassist.version>3.25.0-GA</javaassist.version> <vavr.version>0.10.3</vavr.version> @@ -116,7 +117,7 @@ <version>${log4j.version}</version> </dependency> <dependency> - <groupId>com.graphql-java</groupId> + <groupId>com.graphql-java-kickstart</groupId> <artifactId>graphql-java-tools</artifactId> <version>${graphql-java-tools.version}</version> </dependency> @@ -126,6 +127,11 @@ <version>${graphql-java.version}</version> </dependency> <dependency> + <groupId>com.graphql-java</groupId> + <artifactId>graphql-java-extended-scalars</artifactId> + <version>${graphql-java-extended-scalars.version}</version> + </dependency> + <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> <version>${gson.version}</version> diff --git a/oap-server/oal-grammar/pom.xml b/oap-server/oal-grammar/pom.xml index 85b81b6..4701c8c 100755 --- a/oap-server/oal-grammar/pom.xml +++ b/oap-server/oal-grammar/pom.xml @@ -28,7 +28,7 @@ <artifactId>oal-grammar</artifactId> <properties> - <antlr.version>4.7.1</antlr.version> + <antlr.version>4.9.2</antlr.version> </properties> <dependencies> diff --git a/oap-server/server-query-plugin/query-graphql-plugin/pom.xml b/oap-server/server-query-plugin/query-graphql-plugin/pom.xml index a4c2fd6..189631e 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/pom.xml +++ b/oap-server/server-query-plugin/query-graphql-plugin/pom.xml @@ -48,10 +48,14 @@ <artifactId>graphql-java</artifactId> </dependency> <dependency> - <groupId>com.graphql-java</groupId> + <groupId>com.graphql-java-kickstart</groupId> <artifactId>graphql-java-tools</artifactId> </dependency> <dependency> + <groupId>com.graphql-java</groupId> + <artifactId>graphql-java-extended-scalars</artifactId> + </dependency> + <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </dependency> diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java index 328490b..b27739d 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java @@ -18,8 +18,9 @@ package org.apache.skywalking.oap.query.graphql; -import com.coxautodev.graphql.tools.SchemaParser; import graphql.GraphQL; +import graphql.kickstart.tools.SchemaParser; +import graphql.scalars.ExtendedScalars; import graphql.schema.GraphQLSchema; import org.apache.skywalking.oap.query.graphql.resolver.AggregationQuery; import org.apache.skywalking.oap.query.graphql.resolver.AlarmQuery; @@ -115,6 +116,7 @@ public class GraphQLQueryProvider extends ModuleProvider { .resolvers(new EventQuery(getManager())) .file("query-protocol/metadata-v2.graphqls") .resolvers(new MetadataQueryV2(getManager())) + .scalars(ExtendedScalars.GraphQLLong) .build() .makeExecutableSchema(); this.graphQL = GraphQL.newGraphQL(schema).build(); diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java index 3de9dee..8eaea99 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java index 4a917c5..13faaf2 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java @@ -18,8 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; - +import graphql.kickstart.tools.GraphQLQueryResolver; import graphql.schema.DataFetchingEnvironment; import java.util.ArrayList; import java.util.List; @@ -99,7 +98,7 @@ public class AlarmQuery implements GraphQLQueryResolver { Alarms alarms = getQueryService().getAlarm( scopeId, keyword, paging, startSecondTB, endSecondTB, tags); - final boolean selectEvents = env.getSelectionSet().get().entrySet().stream().anyMatch(it -> it.getKey().contains("/events/")); + final boolean selectEvents = env.getSelectionSet().contains("**/events/**"); if (selectEvents) { return findRelevantEvents(alarms, conditionPrototype); diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java index bb39b82..89fe833 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java @@ -17,7 +17,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.util.Optional; import lombok.RequiredArgsConstructor; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EventQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EventQuery.java index aa9f8b7..da314bc 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EventQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EventQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.query.EventQueryService; import org.apache.skywalking.oap.server.core.query.type.event.EventQueryCondition; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/HealthQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/HealthQuery.java index 0521248..b1eb419 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/HealthQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/HealthQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.util.Optional; import lombok.RequiredArgsConstructor; import org.apache.skywalking.oap.server.core.query.type.HealthStatus; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java index 8ec49f0..500194b 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.UnexpectedException; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java index f9c602b..95a30ae 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java index 4d4dda1..498a6bd 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.util.List; import java.util.stream.Collectors; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQueryV2.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQueryV2.java index 8cc05c4..6a82bb3 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQueryV2.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQueryV2.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java index fce4c13..d267d91 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricsQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricsQuery.java index 2ed2d0b..bcdd34c 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricsQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricsQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Mutation.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Mutation.java index 239588f..d0ebe77 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Mutation.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Mutation.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLMutationResolver; +import graphql.kickstart.tools.GraphQLMutationResolver; /** * Root mutation resolver. diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java index 1677d94..32582fb 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLMutationResolver; +import graphql.kickstart.tools.GraphQLMutationResolver; import java.io.IOException; import org.apache.skywalking.oap.server.core.query.input.ProfileTaskCreationRequest; import org.apache.skywalking.oap.server.core.CoreModule; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileQuery.java index 431d00b..63e1f18 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.query.ProfileTaskQueryService; import org.apache.skywalking.oap.server.core.query.type.BasicTrace; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Query.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Query.java index 737d164..565e2a1 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Query.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Query.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import org.apache.skywalking.oap.server.core.version.Version; /** diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopNRecordsQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopNRecordsQuery.java index a0e317f..d0ecb2c 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopNRecordsQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopNRecordsQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java index 19f98f1..f8cb365 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TraceQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TraceQuery.java index c1a0bf8..2db4705 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TraceQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TraceQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import com.google.common.base.Strings; import java.io.IOException; import org.apache.skywalking.oap.server.core.Const; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/UIConfigurationManagement.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/UIConfigurationManagement.java index 72fe595..00f0eee 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/UIConfigurationManagement.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/UIConfigurationManagement.java @@ -18,8 +18,8 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLMutationResolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLMutationResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt index 38643f8..9de9209 100755 --- a/tools/dependencies/known-oap-backend-dependencies.txt +++ b/tools/dependencies/known-oap-backend-dependencies.txt @@ -3,7 +3,7 @@ HikariCP-3.1.0.jar LatencyUtils-2.0.3.jar animal-sniffer-annotations-1.18.jar annotations-13.0.jar -antlr4-runtime-4.7.1.jar +antlr4-runtime-4.9.2.jar aopalliance-1.0.jar apollo-client-1.8.0.jar apollo-core-1.8.0.jar @@ -15,6 +15,7 @@ bcprov-jdk15on-1.69.jar bcutil-jdk15on-1.69.jar brotli4j-1.6.0.jar checker-qual-2.8.1.jar +classmate-1.5.1.jar client-java-14.0.0.jar client-java-api-14.0.0.jar client-java-proto-14.0.0.jar @@ -40,8 +41,9 @@ failsafe-2.3.4.jar failureaccess-1.0.1.jar flatbuffers-java-1.12.0.jar freemarker-2.3.28.jar -graphql-java-8.0.jar -graphql-java-tools-5.2.3.jar +graphql-java-17.3.jar +graphql-java-extended-scalars-17.0.jar +graphql-java-tools-12.0.2.jar groovy-3.0.8.jar grpc-api-1.43.2.jar grpc-context-1.43.2.jar @@ -70,8 +72,8 @@ jackson-databind-2.12.2.jar jackson-datatype-guava-2.9.10.jar jackson-datatype-jdk8-2.9.10.jar jackson-module-afterburner-2.12.2.jar -jackson-module-kotlin-2.8.8.jar -java-dataloader-2.0.2.jar +jackson-module-kotlin-2.13.1.jar +java-dataloader-3.1.0.jar javassist-3.25.0-GA.jar javax.inject-1.jar javax.servlet-api-3.1.0.jar @@ -90,8 +92,15 @@ joda-time-2.10.5.jar jose4j-0.7.9.jar jsr305-3.0.2.jar kafka-clients-2.4.1.jar -kotlin-reflect-1.1.1.jar -kotlin-stdlib-1.1.60.jar +kotlin-reflect-1.5.0.jar +kotlin-stdlib-1.5.0.jar +kotlin-stdlib-common-1.5.0.jar +kotlin-stdlib-jdk7-1.5.0.jar +kotlin-stdlib-jdk8-1.5.0.jar +kotlinx-coroutines-core-1.5.0-native-mt.jar +kotlinx-coroutines-core-jvm-1.5.0-native-mt.jar +kotlinx-coroutines-jdk8-1.5.0-native-mt.jar +kotlinx-coroutines-reactive-1.5.0-native-mt.jar libthrift-0.14.1.jar listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar log4j-api-2.17.1.jar @@ -134,7 +143,6 @@ proto-google-common-protos-2.0.1.jar protobuf-java-3.19.2.jar protobuf-java-util-3.19.2.jar reactive-streams-1.0.2.jar -reflectasm-1.11.7.jar retrofit-2.5.0.jar service-rpc-0.12.3.jar simpleclient-0.6.0.jar
