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 8e12613fc9312130f8b45624465edf8a69f61716 Author: liubao <[email protected]> AuthorDate: Fri Nov 15 16:06:08 2019 +0800 [SCB-1592]upgrade vert.x and netty.(4)update license and fix conflicts --- java-chassis-dependencies/default/pom.xml | 4 +-- java-chassis-distribution/src/release/LICENSE | 41 +++++++++++++-------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/java-chassis-dependencies/default/pom.xml b/java-chassis-dependencies/default/pom.xml index 93117ea..698f33e 100644 --- a/java-chassis-dependencies/default/pom.xml +++ b/java-chassis-dependencies/default/pom.xml @@ -82,7 +82,7 @@ <mock-server.version>3.10.4</mock-server.version> <narayana.version>5.3.2.Final</narayana.version> <netflix-commons.version>0.3.0</netflix-commons.version> - <netty.version>4.1.31.Final</netty.version> + <netty.version>4.1.43.Final</netty.version> <okhttp3.version>3.14.2</okhttp3.version> <powermock.version>1.6.2</powermock.version> <prometheus.version>0.6.0</prometheus.version> @@ -105,7 +105,7 @@ <tcnetty.version>2.0.26.Final</tcnetty.version> <tec-zkclient.version>0.10</tec-zkclient.version> <tomakehurst.version>2.6.0</tomakehurst.version> - <vertx.version>3.6.3</vertx.version> + <vertx.version>3.8.3</vertx.version> <xstream.version>1.4.11.1</xstream.version> <zipkin.version>2.9.3</zipkin.version> <zipkin-reporter.version>2.7.13</zipkin-reporter.version> diff --git a/java-chassis-distribution/src/release/LICENSE b/java-chassis-distribution/src/release/LICENSE index 9a0d073..a4f65dd 100644 --- a/java-chassis-distribution/src/release/LICENSE +++ b/java-chassis-distribution/src/release/LICENSE @@ -242,9 +242,7 @@ You can find a copy of the License at licenses/LICENSE-epl-v20 * JRuby Core (org.jruby:jruby-core:9.2.6.0 - https://github.com/jruby/jruby/jruby-core) * JRuby Lib Setup (org.jruby:jruby-stdlib:9.2.6.0 - https://github.com/jruby/jruby/jruby-stdlib) * JRuby Main Maven Artifact (org.jruby:jruby:9.2.6.0 - https://github.com/jruby/jruby/jruby-artifacts/jruby) -* Vert.x Core (io.vertx:vertx-core:3.6.3 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-core) -* vertx-web (io.vertx:vertx-web:3.6.3 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-web-parent/vertx-web) - +* Vert.x Core (io.vertx:vertx-core:3.8.3 - https://github.com/eclipse-vertx/vert.x) ================================================================ This product bundles libraries which are licensed under the @@ -517,21 +515,21 @@ For details, see their respective project links. * nailgun-server (com.martiansoftware:nailgun-server:0.9.1 - http://martiansoftware.com/nailgun) * netflix-commons-util (com.netflix.netflix-commons:netflix-commons-util:0.1.1 - https://github.com/Netflix/netflix-commons) * netflix-statistics (com.netflix.netflix-commons:netflix-statistics:0.1.1 - https://github.com/Netflix/netflix-commons) -* Netty/Buffer (io.netty:netty-buffer:4.1.28.Final - http://netty.io/netty-buffer/) -* Netty/Codec/DNS (io.netty:netty-codec-dns:4.1.28.Final - http://netty.io/netty-codec-dns/) -* Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.28.Final - http://netty.io/netty-codec-http/) -* Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.28.Final - http://netty.io/netty-codec-http2/) -* Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.28.Final - http://netty.io/netty-codec-socks/) -* Netty/Codec (io.netty:netty-codec:4.1.28.Final - http://netty.io/netty-codec/) -* Netty/Common (io.netty:netty-common:4.1.28.Final - http://netty.io/netty-common/) -* Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.28.Final - http://netty.io/netty-handler-proxy/) -* Netty/Handler (io.netty:netty-handler:4.1.28.Final - http://netty.io/netty-handler/) -* Netty/Resolver/DNS (io.netty:netty-resolver-dns:4.1.28.Final - http://netty.io/netty-resolver-dns/) -* Netty/Resolver (io.netty:netty-resolver:4.1.28.Final - http://netty.io/netty-resolver/) -* Netty/TomcatNative [BoringSSL - Static] (io.netty:netty-tcnative-boringssl-static:2.0.14.Final - https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/) -* Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.32.Final - http://netty.io/netty-transport-native-epoll/) -* Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.32.Final - http://netty.io/netty-transport-native-unix-common/) -* Netty/Transport (io.netty:netty-transport:4.1.28.Final - http://netty.io/netty-transport/) +* Netty/Buffer (io.netty:netty-buffer:4.1.43.Final - http://netty.io/netty-buffer/) +* Netty/Codec/DNS (io.netty:netty-codec-dns:4.1.43.Final - http://netty.io/netty-codec-dns/) +* Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.43.Final - http://netty.io/netty-codec-http/) +* Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.43.Final - http://netty.io/netty-codec-http2/) +* Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.43.Final - http://netty.io/netty-codec-socks/) +* Netty/Codec (io.netty:netty-codec:4.1.43.Final - http://netty.io/netty-codec/) +* Netty/Common (io.netty:netty-common:4.1.43.Final - http://netty.io/netty-common/) +* Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.43.Final - http://netty.io/netty-handler-proxy/) +* Netty/Handler (io.netty:netty-handler:4.1.43.Final - http://netty.io/netty-handler/) +* Netty/Resolver/DNS (io.netty:netty-resolver-dns:4.1.43.Final - http://netty.io/netty-resolver-dns/) +* Netty/Resolver (io.netty:netty-resolver:4.1.43.Final - http://netty.io/netty-resolver/) +* Netty/TomcatNative [BoringSSL - Static] (io.netty:netty-tcnative-boringssl-static:2.0.26.Final - https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/) +* Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.36.Final - http://netty.io/netty-transport-native-epoll/) +* Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.36.Final - http://netty.io/netty-transport-native-unix-common/) +* Netty/Transport (io.netty:netty-transport:4.1.43.Final - http://netty.io/netty-transport/) * nio-multipart-parser (org.synchronoss.cloud:nio-multipart-parser:1.1.0 - https://github.com/synchronoss/nio-multipart/nio-multipart-parser) * Objenesis (org.objenesis:objenesis:2.5.1 - http://objenesis.org) * OkHttp (com.squareup.okhttp3:okhttp:3.14.2 - https://github.com/square/okhttp/okhttp) @@ -636,6 +634,7 @@ For details, see their respective project links. * msg-simple (com.github.fge:msg-simple:1.1 - https://github.com/fge/msg-simple) * uri-template (com.github.fge:uri-template:0.9 - https://github.com/fge/uri-template) * Javassist (org.javassist:javassist:3.24.0-GA - http://www.javassist.org/) -* Vert.x Bridge Common (io.vertx:vertx-bridge-common:3.6.3 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-bridge-common) -* vertx-auth-common (io.vertx:vertx-auth-common:3.6.3 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-auth/vertx-auth-common) -* vertx-web-common (io.vertx:vertx-web-common:3.6.3 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-web-parent/vertx-web-common) +* Vert.x Bridge Common (io.vertx:vertx-bridge-common:3.8.3 - https://github.com/vert-x3/vertx-bridge-common) +* vertx-auth-common (io.vertx:vertx-auth-common:3.8.3 - https://github.com/vert-x3/vertx-auth) +* vertx-web-common (io.vertx:vertx-web-common:3.8.3 - https://github.com/vert-x3/vertx-web) +* vertx-web (io.vertx:vertx-web:3.8.3 - https://github.com/vert-x3/vertx-web) \ No newline at end of file
