kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump up commons-compress version and polish LAL debug error message (#7668)

This commit is contained in:
kezhenxu94 2021-09-07 12:18:25 +08:00 committed by GitHub
parent 96d3c1e5dd
commit ec03cca31b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist-material/release-docs/LICENSE
View File

@ -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-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-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-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: 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 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 netty 4.1.65: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0

6
oap-server-bom/pom.xml
View File

@ -76,6 +76,7 @@
<armeria.version>1.11.0</armeria.version> <armeria.version>1.11.0</armeria.version>
<awaitility.version>3.0.0</awaitility.version> <awaitility.version>3.0.0</awaitility.version>
<httpcore.version>4.4.13</httpcore.version> <httpcore.version>4.4.13</httpcore.version>
<commons-compress.version>1.21</commons-compress.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -533,6 +534,11 @@
<version>${awaitility.version}</version> <version>${awaitility.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
</project> </project>

4
oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java
View File

@ -53,7 +53,9 @@ public class LogTestQuery implements GraphQLQueryResolver {
public LogTestResponse test(LogTestRequest request) throws Exception { public LogTestResponse test(LogTestRequest request) throws Exception {
if (!config.isEnableLogTestTool()) { 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"); requireNonNull(request, "request");

2
oap-server/server-query-plugin/query-graphql-plugin/src/test/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQueryTest.java
View File

@ -86,7 +86,7 @@ public class LogTestQueryTest extends TestCase {
fail(); fail();
} catch (Exception e) { } catch (Exception e) {
assertTrue(e instanceof IllegalAccessException); assertTrue(e instanceof IllegalAccessException);
assertEquals("LAL debug tool is not enabled", e.getMessage()); assertTrue(e.getMessage().contains("LAL debug tool is not enabled"));
} }
} }

2
tools/dependencies/known-oap-backend-dependencies.txt
View File

@ -21,7 +21,7 @@ client-java-proto-13.0.0.jar
commons-beanutils-1.9.4.jar commons-beanutils-1.9.4.jar
commons-codec-1.11.jar commons-codec-1.11.jar
commons-collections4-4.4.jar commons-collections4-4.4.jar
commons-compress-1.20.jar commons-compress-1.21.jar
commons-dbcp-1.4.jar commons-dbcp-1.4.jar
commons-io-2.6.jar commons-io-2.6.jar
commons-lang3-3.12.0.jar commons-lang3-3.12.0.jar