[incubator-servicecomb-java-chassis] 01/04: [SCB-459]Update netty's version to 4.1.19 and vertx's version to 3.5.1

[liubao]

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/incubator-servicecomb-java-chassis.git

commit c08e7617f6389059af5997226d39a5de87c1767a
Author: xuyiyun0929 <even0...@icloud.com>
AuthorDate: Sun Apr 8 12:14:04 2018 +0800

    [SCB-459]Update netty's version to 4.1.19 and vertx's version to 3.5.1
---
 .../foundation/vertx/TestSimpleBodyHandler.java          |  3 +++
 .../foundation/vertx/TestVertxTLSBuilder.java            | 16 ++++++++--------
 java-chassis-dependencies/pom.xml                        |  4 ++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git 
a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestSimpleBodyHandler.java
 
b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestSimpleBodyHandler.java
index c36e75e..7c4cee4 100644
--- 
a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestSimpleBodyHandler.java
+++ 
b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestSimpleBodyHandler.java
@@ -25,6 +25,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import io.vertx.core.MultiMap;
 import io.vertx.core.http.HttpServerRequest;
 import io.vertx.core.http.HttpServerResponse;
 import io.vertx.ext.web.RoutingContext;
@@ -40,6 +41,8 @@ public class TestSimpleBodyHandler {
     context = Mockito.mock(RoutingContext.class);
     HttpServerRequest request = Mockito.mock(HttpServerRequest.class);
     Mockito.when(context.request()).thenReturn(request);
+    MultiMap multiMap = Mockito.mock(MultiMap.class);
+    Mockito.when(request.headers()).thenReturn(multiMap);
     HttpServerResponse response = Mockito.mock(HttpServerResponse.class);
     
Mockito.when(response.setStatusCode(Status.UNSUPPORTED_MEDIA_TYPE.getStatusCode())).thenReturn(response);
     Mockito.when(context.response()).thenReturn(response);
diff --git 
a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestVertxTLSBuilder.java
 
b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestVertxTLSBuilder.java
index 33ef445..f4acc8a 100644
--- 
a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestVertxTLSBuilder.java
+++ 
b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestVertxTLSBuilder.java
@@ -49,7 +49,7 @@ public class TestVertxTLSBuilder {
     SSLCustom custom = SSLCustom.createSSLCustom(option.getSslCustomClass());
     HttpServerOptions serverOptions = new HttpServerOptions();
     VertxTLSBuilder.buildNetServerOptions(option, custom, serverOptions);
-    
Assert.assertEquals(serverOptions.getEnabledSecureTransportProtocols().toArray().length,
 1);
+    
Assert.assertEquals(serverOptions.getEnabledSecureTransportProtocols().toArray().length,
 3);
     Assert.assertEquals(serverOptions.getClientAuth(), ClientAuth.REQUEST);
   }
 
@@ -90,7 +90,7 @@ public class TestVertxTLSBuilder {
     SSLCustom custom = SSLCustom.createSSLCustom(option.getSslCustomClass());
     HttpClientOptions serverOptions = new HttpClientOptions();
     VertxTLSBuilder.buildHttpClientOptions(option, custom, serverOptions);
-    
Assert.assertEquals(serverOptions.getEnabledSecureTransportProtocols().toArray().length,
 1);
+    
Assert.assertEquals(serverOptions.getEnabledSecureTransportProtocols().toArray().length,
 3);
     Assert.assertEquals(serverOptions.isTrustAll(), true);
   }
 
@@ -100,7 +100,7 @@ public class TestVertxTLSBuilder {
     SSLCustom custom = SSLCustom.createSSLCustom(option.getSslCustomClass());
     HttpClientOptions serverOptions = new HttpClientOptions();
     VertxTLSBuilder.buildClientOptionsBase(option, custom, serverOptions);
-    
Assert.assertEquals(serverOptions.getEnabledSecureTransportProtocols().toArray().length,
 1);
+    
Assert.assertEquals(serverOptions.getEnabledSecureTransportProtocols().toArray().length,
 3);
     Assert.assertEquals(serverOptions.isTrustAll(), true);
   }
 
@@ -113,7 +113,7 @@ public class TestVertxTLSBuilder {
     SSLCustom custom = SSLCustom.createSSLCustom(option.getSslCustomClass());
     HttpClientOptions serverOptions = new HttpClientOptions();
     VertxTLSBuilder.buildClientOptionsBase(option, custom, serverOptions);
-    
Assert.assertEquals(serverOptions.getEnabledSecureTransportProtocols().toArray().length,
 1);
+    
Assert.assertEquals(serverOptions.getEnabledSecureTransportProtocols().toArray().length,
 3);
     Assert.assertEquals(serverOptions.isTrustAll(), true);
   }
 
@@ -130,7 +130,7 @@ public class TestVertxTLSBuilder {
       }
     };
     VertxTLSBuilder.buildClientOptionsBase(option, custom, serverOptions);
-    
Assert.assertEquals(serverOptions.getEnabledSecureTransportProtocols().toArray().length,
 1);
+    
Assert.assertEquals(serverOptions.getEnabledSecureTransportProtocols().toArray().length,
 3);
     Assert.assertEquals(serverOptions.isTrustAll(), true);
   }
 
@@ -147,7 +147,7 @@ public class TestVertxTLSBuilder {
       }
     };
     VertxTLSBuilder.buildClientOptionsBase(option, custom, serverOptions);
-    
Assert.assertEquals(serverOptions.getEnabledSecureTransportProtocols().toArray().length,
 1);
+    
Assert.assertEquals(serverOptions.getEnabledSecureTransportProtocols().toArray().length,
 3);
     Assert.assertEquals(serverOptions.isTrustAll(), true);
   }
 
@@ -164,7 +164,7 @@ public class TestVertxTLSBuilder {
       }
     };
     VertxTLSBuilder.buildClientOptionsBase(option, custom, serverOptions);
-    
Assert.assertEquals(serverOptions.getEnabledSecureTransportProtocols().toArray().length,
 1);
+    
Assert.assertEquals(serverOptions.getEnabledSecureTransportProtocols().toArray().length,
 3);
     Assert.assertEquals(serverOptions.isTrustAll(), true);
   }
 
@@ -182,7 +182,7 @@ public class TestVertxTLSBuilder {
       }
     };
     VertxTLSBuilder.buildNetServerOptions(option, custom, serverOptions);
-    
Assert.assertEquals(serverOptions.getEnabledSecureTransportProtocols().toArray().length,
 1);
+    
Assert.assertEquals(serverOptions.getEnabledSecureTransportProtocols().toArray().length,
 3);
     Assert.assertEquals(serverOptions.getClientAuth(), ClientAuth.REQUEST);
   }
 }
diff --git a/java-chassis-dependencies/pom.xml 
b/java-chassis-dependencies/pom.xml
index b7b6227..b9ab059 100644
--- a/java-chassis-dependencies/pom.xml
+++ b/java-chassis-dependencies/pom.xml
@@ -32,7 +32,7 @@
 
   <properties>
     <jackson.version>2.9.4</jackson.version>
-    <vertx.version>3.5.0</vertx.version>
+    <vertx.version>3.5.1</vertx.version>
     <tec.zkclient.version>0.8</tec.zkclient.version>
     <spring.version>4.3.5.RELEASE</spring.version>
     <slf4j.version>1.7.7</slf4j.version>
@@ -45,7 +45,7 @@
     <apache.httpclient>4.5.2</apache.httpclient>
     <protostuff.version>1.5.2</protostuff.version>
     <swagger.version>1.5.12</swagger.version>
-    <netty.version>4.1.17.Final</netty.version>
+    <netty.version>4.1.19.Final</netty.version>
     <tcnetty.version>2.0.7.Final</tcnetty.version>
     <main.basedir>${basedir}/../..</main.basedir>
     <narayana.version>5.3.2.Final</narayana.version>

-- 
To stop receiving notification emails like this one, please contact
liu...@apache.org.