liubao68 closed pull request #637: [SCB-459]Update netty's version to 4.1.19
and vertx's version to 3.5.1
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/637
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxTLSBuilder.java
b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxTLSBuilder.java
index a7a351a4c..a2536964a 100644
---
a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxTLSBuilder.java
+++
b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxTLSBuilder.java
@@ -18,6 +18,8 @@
package org.apache.servicecomb.foundation.vertx;
import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
import org.apache.servicecomb.foundation.ssl.SSLCustom;
import org.apache.servicecomb.foundation.ssl.SSLManager;
@@ -126,10 +128,8 @@ private static TCPSSLOptions buildTCPSSLOptions(SSLOption
sslOption, SSLCustom s
throw new IllegalArgumentException("invalid trust store type.");
}
}
-
- for (String protocol : sslOption.getProtocols().split(",")) {
- tcpClientOptions.addEnabledSecureTransportProtocol(protocol);
- }
+ HashSet<String> protocols = new
HashSet<>(Arrays.asList(sslOption.getProtocols().split(",")));
+ tcpClientOptions.setEnabledSecureTransportProtocols(protocols);
for (String cipher : SSLManager.getEnalbedCiphers(sslOption.getCiphers()))
{
tcpClientOptions.addEnabledCipherSuite(cipher);
}
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 c36e75e0e..7c4cee493 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.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 void setUp() throws Exception {
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 33ef44538..3f14f0862 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
@@ -63,7 +63,7 @@ public void testbuildHttpClientOptions_sslKey_noFactory() {
public static class SSLOptionFactoryForTest implements SSLOptionFactory {
static SSLOption sslOption = new SSLOption();
static {
- sslOption.setEngine("openssl");
+ sslOption.setEngine("openssl");
sslOption.setProtocols("");
sslOption.setCiphers(SSLOption.DEFAUL_CIPHERS);
sslOption.setCheckCNHost(true);
diff --git a/java-chassis-dependencies/pom.xml
b/java-chassis-dependencies/pom.xml
index b7b622785..b9ab059a5 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>
diff --git a/java-chassis-distribution/src/release/LICENSE
b/java-chassis-distribution/src/release/LICENSE
index 8243952fa..eac3a4243 100644
--- a/java-chassis-distribution/src/release/LICENSE
+++ b/java-chassis-distribution/src/release/LICENSE
@@ -358,19 +358,19 @@ Jackson-dataformat-XML
(http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding
Jackson-dataformat-YAML
(https://github.com/FasterXML/jackson-dataformats-text)
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:bundle:2.9.2
Javassist (http://www.javassist.org/) org.javassist:javassist:bundle:3.18.1-GA
Log4j Implemented Over SLF4J (http://www.slf4j.org)
org.slf4j:log4j-over-slf4j:jar:1.7.7
-Netty/Buffer (http://netty.io/netty-buffer/)
io.netty:netty-buffer:jar:4.1.17.Final
-Netty/Codec (http://netty.io/netty-codec/)
io.netty:netty-codec:jar:4.1.17.Final
-Netty/Codec/DNS (http://netty.io/netty-codec-dns/)
io.netty:netty-codec-dns:jar:4.1.17.Final
-Netty/Codec/HTTP (http://netty.io/netty-codec-http/)
io.netty:netty-codec-http:jar:4.1.17.Final
-Netty/Codec/HTTP2 (http://netty.io/netty-codec-http2/)
io.netty:netty-codec-http2:jar:4.1.17.Final
-Netty/Codec/Socks (http://netty.io/netty-codec-socks/)
io.netty:netty-codec-socks:jar:4.1.17.Final
-Netty/Common (http://netty.io/netty-common/)
io.netty:netty-common:jar:4.1.17.Final
-Netty/Handler (http://netty.io/netty-handler/)
io.netty:netty-handler:jar:4.1.17.Final
-Netty/Handler/Proxy (http://netty.io/netty-handler-proxy/)
io.netty:netty-handler-proxy:jar:4.1.17.Final
-Netty/Resolver (http://netty.io/netty-resolver/)
io.netty:netty-resolver:jar:4.1.17.Final
-Netty/Resolver/DNS (http://netty.io/netty-resolver-dns/)
io.netty:netty-resolver-dns:jar:4.1.17.Final
+Netty/Buffer (http://netty.io/netty-buffer/)
io.netty:netty-buffer:jar:4.1.19.Final
+Netty/Codec (http://netty.io/netty-codec/)
io.netty:netty-codec:jar:4.1.19.Final
+Netty/Codec/DNS (http://netty.io/netty-codec-dns/)
io.netty:netty-codec-dns:jar:4.1.19.Final
+Netty/Codec/HTTP (http://netty.io/netty-codec-http/)
io.netty:netty-codec-http:jar:4.1.19.Final
+Netty/Codec/HTTP2 (http://netty.io/netty-codec-http2/)
io.netty:netty-codec-http2:jar:4.1.19.Final
+Netty/Codec/Socks (http://netty.io/netty-codec-socks/)
io.netty:netty-codec-socks:jar:4.1.19.Final
+Netty/Common (http://netty.io/netty-common/)
io.netty:netty-common:jar:4.1.19.Final
+Netty/Handler (http://netty.io/netty-handler/)
io.netty:netty-handler:jar:4.1.19.Final
+Netty/Handler/Proxy (http://netty.io/netty-handler-proxy/)
io.netty:netty-handler-proxy:jar:4.1.19.Final
+Netty/Resolver (http://netty.io/netty-resolver/)
io.netty:netty-resolver:jar:4.1.19.Final
+Netty/Resolver/DNS (http://netty.io/netty-resolver-dns/)
io.netty:netty-resolver-dns:jar:4.1.19.Final
Netty/TomcatNative(https://netty.io/wiki/forked-tomcat-native.html)
io.netty:netty-tcnative-boringssl-static:2.0.7.Final
-Netty/Transport (http://netty.io/netty-transport/)
io.netty:netty-transport:jar:4.1.17.Final
+Netty/Transport (http://netty.io/netty-transport/)
io.netty:netty-transport:jar:4.1.19.Final
OkHttp (https://github.com/square/okhttp/okhttp)
com.squareup.okhttp3:okhttp:jar:3.4.1
Okio (https://github.com/square/okio/okio) com.squareup.okio:okio:jar:1.9.0
Prometheus Java Simpleclient
(http://github.com/prometheus/client_java/simpleclient)
io.prometheus:simpleclient:bundle:0.1.0
@@ -398,8 +398,8 @@ Spring Core
(https://github.com/spring-projects/spring-framework) org.springfram
Spring Expression Language (SpEL)
(https://github.com/spring-projects/spring-framework)
org.springframework:spring-expression:jar:4.3.5.RELEASE
Spring Web (https://github.com/spring-projects/spring-framework)
org.springframework:spring-web:jar:4.3.5.RELEASE
Spring Web MVC (https://github.com/spring-projects/spring-framework)
org.springframework:spring-webmvc:jar:4.3.5.RELEASE
-Vert.x Bridge Common
(http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-bridge-common)
io.vertx:vertx-bridge-common:jar:3.5.0
-Vert.x Core
(http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-core)
io.vertx:vertx-core:jar:3.5.0
+Vert.x Bridge Common
(http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-bridge-common)
io.vertx:vertx-bridge-common:jar:3.5.1
+Vert.x Core
(http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-core)
io.vertx:vertx-core:jar:3.5.1
Woodstox (https://github.com/FasterXML/woodstox)
com.fasterxml.woodstox:woodstox-core:bundle:5.0.3
Zipkin Reporter Spring Factory Beans
(https://github.com/openzipkin/zipkin-reporter-java/zipkin-reporter-spring-beans)
io.zipkin.reporter2:zipkin-reporter-spring-beans:jar:2.2.2
Zipkin Reporter: Core
(https://github.com/openzipkin/zipkin-reporter-java/zipkin-reporter)
io.zipkin.reporter2:zipkin-reporter:jar:2.2.2
@@ -448,6 +448,6 @@ tomcat-embed-core (http://tomcat.apache.org/)
org.apache.tomcat.embed:tomcat-emb
tomcat-embed-el (http://tomcat.apache.org/)
org.apache.tomcat.embed:tomcat-embed-el:jar:8.0.33
tomcat-embed-logging-juli (http://tomcat.apache.org/)
org.apache.tomcat.embed:tomcat-embed-logging-juli:jar:8.0.33
tomcat-embed-websocket (http://tomcat.apache.org/)
org.apache.tomcat.embed:tomcat-embed-websocket:jar:8.0.33
-vertx-auth-common
(http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-auth/vertx-auth-common)
io.vertx:vertx-auth-common:jar:3.5.0
-vertx-web
(http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-web-parent/vertx-web)
io.vertx:vertx-web:jar:3.5.0
+vertx-auth-common
(http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-auth/vertx-auth-common)
io.vertx:vertx-auth-common:jar:3.5.1
+vertx-web
(http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-web-parent/vertx-web)
io.vertx:vertx-web:jar:3.5.1
zuul-core (https://github.com/Netflix/zuul)
com.netflix.zuul:zuul-core:jar:1.3.0
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
