This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new ec03cca Bump up commons-compress version and polish LAL debug error
message (#7668)
ec03cca is described below
commit ec03cca31bb46b83866d3d60e774cc9034f01d04
Author: kezhenxu94 <[email protected]>
AuthorDate: Tue Sep 7 12:18:25 2021 +0800
Bump up commons-compress version and polish LAL debug error message (#7668)
---
dist-material/release-docs/LICENSE | 2 +-
oap-server-bom/pom.xml | 6 ++++++
.../apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java | 4 +++-
.../skywalking/oap/query/graphql/resolver/LogTestQueryTest.java | 2 +-
tools/dependencies/known-oap-backend-dependencies.txt | 2 +-
5 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/dist-material/release-docs/LICENSE
b/dist-material/release-docs/LICENSE
index da5aa84..fe74708 100755
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -255,7 +255,7 @@ The text of each license is the standard Apache 2.0 license.
Apache: commons-collections 3.2.2:
https://github.com/apache/commons-collections, Apache 2.0
Apache: commons-configuration 1.8:
https://github.com/apache/commons-configuration, Apache 2.0
Apache: commons-io 2.4: https://github.com/apache/commons-io, Apache 2.0
- Apache: commons-compress 1.20: https://github.com/apache/commons-compress,
Apache 2.0
+ Apache: commons-compress 1.21: https://github.com/apache/commons-compress,
Apache 2.0
Apache: commons-collections4 4.4:
https://mvnrepository.com/artifact/org.apache.commons/commons-collections4,
Apache 2.0
Apache: freemarker 2.3.28: https://github.com/apache/freemarker, Apache 2.0
netty 4.1.65: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache
2.0
diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
index ae8fc09..36a9390 100644
--- a/oap-server-bom/pom.xml
+++ b/oap-server-bom/pom.xml
@@ -76,6 +76,7 @@
<armeria.version>1.11.0</armeria.version>
<awaitility.version>3.0.0</awaitility.version>
<httpcore.version>4.4.13</httpcore.version>
+ <commons-compress.version>1.21</commons-compress.version>
</properties>
<dependencyManagement>
@@ -533,6 +534,11 @@
<version>${awaitility.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>${commons-compress.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
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 e71916e..527ff9c 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
@@ -53,7 +53,9 @@ public class LogTestQuery implements GraphQLQueryResolver {
public LogTestResponse test(LogTestRequest request) throws Exception {
if (!config.isEnableLogTestTool()) {
- throw new IllegalAccessException("LAL debug tool is not enabled");
+ throw new IllegalAccessException(
+ "LAL debug tool is not enabled. To enable, please set
SW_QUERY_GRAPHQL_ENABLE_LOG_TEST_TOOL=true," +
+ "for more details, refer to
https://skywalking.apache.org/docs/main/latest/en/setup/backend/configuration-vocabulary/";);
}
requireNonNull(request, "request");
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/test/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQueryTest.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/test/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQueryTest.java
index 38f8786..803a86d 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/test/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQueryTest.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/test/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQueryTest.java
@@ -86,7 +86,7 @@ public class LogTestQueryTest extends TestCase {
fail();
} catch (Exception e) {
assertTrue(e instanceof IllegalAccessException);
- assertEquals("LAL debug tool is not enabled", e.getMessage());
+ assertTrue(e.getMessage().contains("LAL debug tool is not
enabled"));
}
}
diff --git a/tools/dependencies/known-oap-backend-dependencies.txt
b/tools/dependencies/known-oap-backend-dependencies.txt
index 349c0b8..4ee6abc 100755
--- a/tools/dependencies/known-oap-backend-dependencies.txt
+++ b/tools/dependencies/known-oap-backend-dependencies.txt
@@ -21,7 +21,7 @@ client-java-proto-13.0.0.jar
commons-beanutils-1.9.4.jar
commons-codec-1.11.jar
commons-collections4-4.4.jar
-commons-compress-1.20.jar
+commons-compress-1.21.jar
commons-dbcp-1.4.jar
commons-io-2.6.jar
commons-lang3-3.12.0.jar
