This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch 1.3.x in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
commit fa049bb101d557fec40d1410e67d10d347309927 Author: AngLi2 <[email protected]> AuthorDate: Mon Nov 18 15:18:57 2019 +0800 [SCB-1582] Update thirdparty dependency versions and delete unused dependencies --- java-chassis-dependencies/default/pom.xml | 20 +++++++++++--------- .../response/TestJaxrsConsumerResponseMapper.java | 6 +++++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/java-chassis-dependencies/default/pom.xml b/java-chassis-dependencies/default/pom.xml index e66246f..a65867b 100644 --- a/java-chassis-dependencies/default/pom.xml +++ b/java-chassis-dependencies/default/pom.xml @@ -32,7 +32,6 @@ <properties> <!-- Dependency versions --> - <apache-commons.version>3.7</apache-commons.version> <archaius.version>0.7.6</archaius.version> <asciidoctorj.version>1.6.2</asciidoctorj.version> <aspectj.version>1.9.3</aspectj.version> @@ -43,6 +42,7 @@ <commons-configuration.version>1.10</commons-configuration.version> <commons-io.version>2.6</commons-io.version> <commons-lang.version>2.6</commons-lang.version> + <commons-lang3.version>3.9</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> @@ -70,7 +70,7 @@ <javax-servlet.version>4.0.1</javax-servlet.version> <javax-transaction.version>1.2</javax-transaction.version> <javax-validation.version>2.0.1.Final</javax-validation.version> - <javax-ws-rs.version>2.0.1</javax-ws-rs.version> + <javax-ws-rs.version>2.1</javax-ws-rs.version> <jedis.version>2.9.0</jedis.version> <jersey.version>2.27</jersey.version> <jettison.version>1.4.0</jettison.version> @@ -260,12 +260,8 @@ <version>${guava.version}</version> <exclusions> <exclusion> - <groupId>com.google.errorprone</groupId> - <artifactId>error_prone_annotations</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-annotations</artifactId> + <groupId>*</groupId> + <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> @@ -274,6 +270,12 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> <version>${guice.version}</version> + <exclusions> + <exclusion> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -719,7 +721,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>${apache-commons.version}</version> + <version>${commons-lang3.version}</version> </dependency> <dependency> diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsConsumerResponseMapper.java b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsConsumerResponseMapper.java index b35a4e9..2a32415 100644 --- a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsConsumerResponseMapper.java +++ b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsConsumerResponseMapper.java @@ -40,6 +40,8 @@ public class TestJaxrsConsumerResponseMapper { int status; + String reason; + Object entity; Map<String, Object> headers = new LinkedHashMap<>(); @@ -53,8 +55,9 @@ public class TestJaxrsConsumerResponseMapper { public void setup() { responseBuilder = new MockUp<ResponseBuilder>() { @Mock - ResponseBuilder status(int status) { + ResponseBuilder status(int status, String reasonPhrase) { TestJaxrsConsumerResponseMapper.this.status = status; + TestJaxrsConsumerResponseMapper.this.reason = reasonPhrase; return responseBuilder; } @@ -98,6 +101,7 @@ public class TestJaxrsConsumerResponseMapper { mapper.mapResponse(response); Assert.assertEquals(Status.OK.getStatusCode(), status); + Assert.assertEquals(Status.OK.getReasonPhrase(), reason); Assert.assertEquals("ret", entity); Assert.assertEquals(0, headers.size()); }
