This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 81d63de [SCB-2098] update some 3rd dependencies (#2006)
81d63de is described below
commit 81d63de902e08bf8b840598c563ba554ea1f2442
Author: 兴 <[email protected]>
AuthorDate: Tue Oct 27 11:36:25 2020 +0800
[SCB-2098] update some 3rd dependencies (#2006)
1、guava 29.0 cache has to dependency failureaccess
2、commons-io 2.8.0 add check filename logic, ContentFileReader#read method
change to read from content, loader#load set a default name.
---
dependencies/default/pom.xml | 16 +++++++++++-----
foundations/foundation-common/pom.xml | 4 ++++
.../protobuf/internal/parser/ContentFileReader.java | 6 ++++--
.../foundation/protobuf/internal/parser/ProtoParser.java | 4 +++-
.../rest/client/http/TestDefaultHttpClientFilter.java | 4 ++--
5 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml
index 346c40f..f4e47ec 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -40,9 +40,9 @@
<classmate.version>1.5.0</classmate.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-configuration.version>1.10</commons-configuration.version>
- <commons-io.version>2.6</commons-io.version>
+ <commons-io.version>2.8.0</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
- <commons-lang3.version>3.9</commons-lang3.version>
+ <commons-lang3.version>3.11</commons-lang3.version>
<commons-logging.version>1.2</commons-logging.version>
<cxf.version>3.3.1</cxf.version>
<dyuproject-protostuff.version>1.0.7.fixed.3500</dyuproject-protostuff.version>
@@ -53,7 +53,8 @@
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
<governator-annotations.version>1.14.2</governator-annotations.version>
<governator-api.version>1.12.10</governator-api.version>
- <guava.version>26.0-jre</guava.version>
+ <guava.version>30.0-jre</guava.version>
+ <failureaccess.version>1.0.1</failureaccess.version>
<guice.version>4.2.0</guice.version>
<hamcrest.version>1.3</hamcrest.version>
<hdr-histogram.version>2.1.10</hdr-histogram.version>
@@ -61,7 +62,7 @@
<hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
<httpcomponents.version>4.5.7</httpcomponents.version>
<hystrix.version>1.5.18</hystrix.version>
- <jackson.version>2.10.0</jackson.version>
+ <jackson.version>2.10.5</jackson.version>
<javakaffee.version>0.26</javakaffee.version>
<javax-annotation.version>1.3.2</javax-annotation.version>
<javax-inject.version>1</javax-inject.version>
@@ -96,7 +97,7 @@
<servlet-api.version>4.0.3</servlet-api.version>
<activation.version>1.2.1</activation.version>
<slf4j.version>1.7.30</slf4j.version>
- <snakeyaml.version>1.24</snakeyaml.version>
+ <snakeyaml.version>1.27</snakeyaml.version>
<spectator.version>0.83.0</spectator.version>
<spring.version>5.1.14.RELEASE</spring.version>
<spring-boot.version>2.1.6.RELEASE</spring-boot.version>
@@ -216,6 +217,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ <version>${failureaccess.version}</version>
+ </dependency>
<dependency>
<groupId>com.google.inject</groupId>
diff --git a/foundations/foundation-common/pom.xml
b/foundations/foundation-common/pom.xml
index 3ab9845..acb3309 100644
--- a/foundations/foundation-common/pom.xml
+++ b/foundations/foundation-common/pom.xml
@@ -67,6 +67,10 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ </dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
diff --git
a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ContentFileReader.java
b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ContentFileReader.java
index a501221..e330d10 100644
---
a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ContentFileReader.java
+++
b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ContentFileReader.java
@@ -25,11 +25,13 @@ import io.protostuff.compiler.parser.FileReader;
public class ContentFileReader implements FileReader {
private FileReader importReader;
+ private String content;
private boolean contentReaded;
- public ContentFileReader(FileReader importReader) {
+ public ContentFileReader(FileReader importReader, String content) {
this.importReader = importReader;
+ this.content = content;
}
@Nullable
@@ -37,7 +39,7 @@ public class ContentFileReader implements FileReader {
public CharStream read(String contentOrName) {
if (!contentReaded) {
contentReaded = true;
- return CharStreams.fromString(contentOrName);
+ return CharStreams.fromString(this.content);
}
return importReader.read(contentOrName);
diff --git
a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ProtoParser.java
b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ProtoParser.java
index 7b07a29..d574bf9 100644
---
a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ProtoParser.java
+++
b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ProtoParser.java
@@ -32,6 +32,8 @@ import io.protostuff.compiler.parser.ProtoContext;
* can be reused
*/
public class ProtoParser {
+ private static final String DEFAULT_PROTO_NAME = "default.proto";
+
private Injector injector = Guice.createInjector(new ParserModule());
private FileReaderFactory fileReaderFactory =
injector.getInstance(FileReaderFactory.class);
@@ -48,7 +50,7 @@ public class ProtoParser {
if (classLoader == null) {
Thread.currentThread().setContextClassLoader(ProtoParser.class.getClassLoader());
}
- ProtoContext context = loader.load(new ContentFileReader(defaultReader),
content);
+ ProtoContext context = loader.load(new ContentFileReader(defaultReader,
content), DEFAULT_PROTO_NAME);
return context.getProto();
} finally {
Thread.currentThread().setContextClassLoader(classLoader);
diff --git
a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java
b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java
index 4595fcf..b666977 100644
---
a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java
+++
b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java
@@ -159,7 +159,7 @@ public class TestDefaultHttpClientFilter {
"InvocationException: code=400;msg=CommonExceptionData [message=method
null, path null, statusCode 400, reasonPhrase null, response content-type null
is not supported]",
invocationException.getMessage());
Assert.assertEquals("Unrecognized token 'abc': was expecting (JSON String,
Number, Array, Object or token 'null', 'true' or 'false')\n"
- + " at [Source:
(org.apache.servicecomb.foundation.vertx.stream.BufferInputStream); line: 1,
column: 7]",
+ + " at [Source:
(org.apache.servicecomb.foundation.vertx.stream.BufferInputStream); line: 1,
column: 4]",
invocationException.getCause().getMessage());
Assert.assertEquals(CommonExceptionData.class,
invocationException.getErrorData().getClass());
CommonExceptionData commonExceptionData = (CommonExceptionData)
invocationException.getErrorData();
@@ -205,7 +205,7 @@ public class TestDefaultHttpClientFilter {
"InvocationException: code=400;msg=CommonExceptionData [message=method
null, path null, statusCode 200, reasonPhrase null, response content-type null
is not supported]",
invocationException.getMessage());
Assert.assertEquals("Unrecognized token 'abc': was expecting (JSON String,
Number, Array, Object or token 'null', 'true' or 'false')\n"
- + " at [Source:
(org.apache.servicecomb.foundation.vertx.stream.BufferInputStream); line: 1,
column: 7]",
+ + " at [Source:
(org.apache.servicecomb.foundation.vertx.stream.BufferInputStream); line: 1,
column: 4]",
invocationException.getCause().getMessage());
Assert.assertEquals(CommonExceptionData.class,
invocationException.getErrorData().getClass());
CommonExceptionData commonExceptionData = (CommonExceptionData)
invocationException.getErrorData();
