From dc86de726a75a89cbc4acb0a1cfa044f33793e8e Mon Sep 17 00:00:00 2001 From: Yuta HIGUCHI Date: Wed, 8 Nov 2017 20:43:27 -0800 Subject: [PATCH] rolling back to netty 4.1.8 Change-Id: I6dd305780eda38bb1ad6edb32de4d9aeca3d96ea --- features/BUCK | 1 - lib/BUCK | 84 ++++++++----------- lib/deps.json | 22 +++-- lib/pom.xml | 2 +- .../bgp/controller/impl/Controller.java | 2 +- protocols/openflow/ctl/pom.xml | 2 +- 6 files changed, 50 insertions(+), 63 deletions(-) diff --git a/features/BUCK b/features/BUCK index af2bb9cf9d..4ae904eed0 100644 --- a/features/BUCK +++ b/features/BUCK @@ -14,7 +14,6 @@ osgi_feature ( '//lib:netty-transport', '//lib:netty-handler', '//lib:netty-codec', - '//lib:netty-transport-native-unix-common', '//lib:netty-transport-native-epoll', '//lib:netty-resolver', '//lib:commons-pool', diff --git a/lib/BUCK b/lib/BUCK index 9ae0dfd455..c36758e4fa 100644 --- a/lib/BUCK +++ b/lib/BUCK @@ -1,4 +1,4 @@ -# ***** This file was auto-generated at Tue, 7 Nov 2017 01:42:57 GMT. Do not edit this file manually. ***** +# ***** This file was auto-generated at Thu, 9 Nov 2017 04:08:17 GMT. Do not edit this file manually. ***** # ***** Use onos-lib-gen ***** pass_thru_pom( @@ -105,7 +105,6 @@ osgi_feature_group( exported_deps = [ ':netty-buffer', ':netty-common', - ':netty-transport-native-unix-common', ], ) @@ -829,91 +828,82 @@ remote_jar ( remote_jar ( name = 'netty-buffer', - out = 'netty-buffer-4.1.16.Final.jar', - url = 'mvn:io.netty:netty-buffer:jar:4.1.16.Final', - sha1 = '63b5fa95c74785e16f2c30ce268bc222e35c8cb5', - maven_coords = 'io.netty:netty-buffer:4.1.16.Final', + out = 'netty-buffer-4.1.8.Final.jar', + url = 'mvn:io.netty:netty-buffer:jar:4.1.8.Final', + sha1 = '43292c2622e340a0d07178c341ca3bdf3d662034', + maven_coords = 'io.netty:netty-buffer:4.1.8.Final', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'netty-codec', - out = 'netty-codec-4.1.16.Final.jar', - url = 'mvn:io.netty:netty-codec:jar:4.1.16.Final', - sha1 = 'd84a1f21768b7309c2954521cf5a1f46c2309eb1', - maven_coords = 'io.netty:netty-codec:4.1.16.Final', + out = 'netty-codec-4.1.8.Final.jar', + url = 'mvn:io.netty:netty-codec:jar:4.1.8.Final', + sha1 = '1bd0a2d032e5c7fc3f42c1b483d0f4c57eb516a3', + maven_coords = 'io.netty:netty-codec:4.1.8.Final', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'netty-common', - out = 'netty-common-4.1.16.Final.jar', - url = 'mvn:io.netty:netty-common:jar:4.1.16.Final', - sha1 = '177a6b30cca92f6f5f9873c9befd681377a4c328', - maven_coords = 'io.netty:netty-common:4.1.16.Final', + out = 'netty-common-4.1.8.Final.jar', + url = 'mvn:io.netty:netty-common:jar:4.1.8.Final', + sha1 = 'ee62c80318413d2375d145e51e48d7d35c901324', + maven_coords = 'io.netty:netty-common:4.1.8.Final', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'netty-handler', - out = 'netty-handler-4.1.16.Final.jar', - url = 'mvn:io.netty:netty-handler:jar:4.1.16.Final', - sha1 = 'fec0e63e7dd7f4eeef7ea8dc47a1ff32dfc7ebc2', - maven_coords = 'io.netty:netty-handler:4.1.16.Final', + out = 'netty-handler-4.1.8.Final.jar', + url = 'mvn:io.netty:netty-handler:jar:4.1.8.Final', + sha1 = 'db01139bfb11afd009a695eef55b43bbf22c4ef5', + maven_coords = 'io.netty:netty-handler:4.1.8.Final', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'netty-transport', - out = 'netty-transport-4.1.16.Final.jar', - url = 'mvn:io.netty:netty-transport:jar:4.1.16.Final', - sha1 = '3c8ee2c4d4a1cbb947a5c184c7aeb2204260958b', - maven_coords = 'io.netty:netty-transport:4.1.16.Final', - visibility = [ 'PUBLIC' ], -) - -remote_jar ( - name = 'netty-transport-native-unix-common', - out = 'netty-transport-native-unix-common-4.1.16.Final.jar', - url = 'mvn:io.netty:netty-transport-native-unix-common:jar:4.1.16.Final', - sha1 = '8acbda23f39f60478bb73ea7c86e9fe121c13f7b', - maven_coords = 'io.netty:netty-transport-native-unix-common:4.1.16.Final', + out = 'netty-transport-4.1.8.Final.jar', + url = 'mvn:io.netty:netty-transport:jar:4.1.8.Final', + sha1 = '905b5dadce881c9824b3039c0df36dabbb7b6a07', + maven_coords = 'io.netty:netty-transport:4.1.8.Final', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'netty-transport-native-epoll', - out = 'netty-transport-native-epoll-4.1.16.Final.jar', - url = 'mvn:io.netty:netty-transport-native-epoll:jar:4.1.16.Final', - sha1 = 'd3d29837ecb6dc549cc37f9daf6b14bc6cd6c898', - maven_coords = 'io.netty:netty-transport-native-epoll:4.1.16.Final', + out = 'netty-transport-native-epoll-4.1.8.Final.jar', + url = 'mvn:io.netty:netty-transport-native-epoll:jar:4.1.8.Final', + sha1 = 'de9052874d9ff9b411bfc465869f620cab643d8d', + maven_coords = 'io.netty:netty-transport-native-epoll:4.1.8.Final', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'netty-resolver', - out = 'netty-resolver-4.1.16.Final.jar', - url = 'mvn:io.netty:netty-resolver:jar:4.1.16.Final', - sha1 = 'f6eb553b53fb3a90a8ac1170697093fed82eae28', - maven_coords = 'io.netty:netty-resolver:4.1.16.Final', + out = 'netty-resolver-4.1.8.Final.jar', + url = 'mvn:io.netty:netty-resolver:jar:4.1.8.Final', + sha1 = '2e116cdd5edc01b2305072b1dbbd17c0595dbfef', + maven_coords = 'io.netty:netty-resolver:4.1.8.Final', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'netty-codec-http2', - out = 'netty-codec-http2-4.1.16.Final.jar', - url = 'mvn:io.netty:netty-codec-http2:jar:4.1.16.Final', - sha1 = '45c27cddac120a4fcda8f699659e59389f7b9736', - maven_coords = 'io.netty:netty-codec-http2:4.1.16.Final', + out = 'netty-codec-http2-4.1.8.Final.jar', + url = 'mvn:io.netty:netty-codec-http2:jar:4.1.8.Final', + sha1 = '105a99ee5767463370ccc3d2e16800bd99f5648e', + maven_coords = 'io.netty:netty-codec-http2:4.1.8.Final', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'netty-codec-http', - out = 'netty-codec-http-4.1.16.Final.jar', - url = 'mvn:io.netty:netty-codec-http:jar:4.1.16.Final', - sha1 = 'd64312378b438dfdad84267c599a053327c6f02a', - maven_coords = 'io.netty:netty-codec-http:4.1.16.Final', + out = 'netty-codec-http-4.1.8.Final.jar', + url = 'mvn:io.netty:netty-codec-http:jar:4.1.8.Final', + sha1 = '1e88617c4a6c88da7e86fdbbd9494d22a250c879', + maven_coords = 'io.netty:netty-codec-http:4.1.8.Final', visibility = [ 'PUBLIC' ], ) diff --git a/lib/deps.json b/lib/deps.json index b5a7824f4d..d2b0e9dd52 100644 --- a/lib/deps.json +++ b/lib/deps.json @@ -68,8 +68,7 @@ ], "NETTY": [ "netty-buffer", - "netty-common", - "netty-transport-native-unix-common" + "netty-common" ], "GRPC_1.3": [ // "grpc-core-1.3.0", @@ -187,16 +186,15 @@ "minimal-json": "mvn:com.eclipsesource.minimal-json:minimal-json:0.9.4", "minlog": "mvn:com.esotericsoftware:minlog:1.3.0", "netty": "mvn:io.netty:netty:3.10.5.Final", - "netty-buffer": "mvn:io.netty:netty-buffer:4.1.16.Final", - "netty-codec": "mvn:io.netty:netty-codec:4.1.16.Final", - "netty-common": "mvn:io.netty:netty-common:4.1.16.Final", - "netty-handler": "mvn:io.netty:netty-handler:4.1.16.Final", - "netty-transport": "mvn:io.netty:netty-transport:4.1.16.Final", - "netty-transport-native-unix-common": "mvn:io.netty:netty-transport-native-unix-common:4.1.16.Final", - "netty-transport-native-epoll": "mvn:io.netty:netty-transport-native-epoll:4.1.16.Final", - "netty-resolver": "mvn:io.netty:netty-resolver:4.1.16.Final", - "netty-codec-http2": "mvn:io.netty:netty-codec-http2:4.1.16.Final", - "netty-codec-http": "mvn:io.netty:netty-codec-http:4.1.16.Final", + "netty-buffer": "mvn:io.netty:netty-buffer:4.1.8.Final", + "netty-codec": "mvn:io.netty:netty-codec:4.1.8.Final", + "netty-common": "mvn:io.netty:netty-common:4.1.8.Final", + "netty-handler": "mvn:io.netty:netty-handler:4.1.8.Final", + "netty-transport": "mvn:io.netty:netty-transport:4.1.8.Final", + "netty-transport-native-epoll": "mvn:io.netty:netty-transport-native-epoll:4.1.8.Final", + "netty-resolver": "mvn:io.netty:netty-resolver:4.1.8.Final", + "netty-codec-http2": "mvn:io.netty:netty-codec-http2:4.1.8.Final", + "netty-codec-http": "mvn:io.netty:netty-codec-http:4.1.8.Final", "objenesis": "mvn:org.objenesis:objenesis:2.6", "openflowj": "mvn:org.onosproject:openflowj:3.2.0.onos", "org.apache.felix.framework.security": "mvn:org.onosproject:org.apache.felix.framework.security:jar:2.2.0.onos", diff --git a/lib/pom.xml b/lib/pom.xml index f904eaa566..8dc6f8cb52 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -37,7 +37,7 @@ UTF-8 1.12.0-SNAPSHOT - 4.1.16.Final + 4.1.8.Final 3.2.0.onos 1.10 2.3.0-b3 diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/Controller.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/Controller.java index 099c207fd0..e9a1f642f7 100644 --- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/Controller.java +++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/Controller.java @@ -221,7 +221,7 @@ public class Controller { */ public void start() { log.info("Started"); - if (!PlatformDependent.isWindows() && !PlatformDependent.maybeSuperUser()) { + if (!PlatformDependent.isWindows() && !PlatformDependent.isRoot()) { portNumber = BGP_PRIVILEGED_PORT; } else { portNumber = BGP_PORT_NUM; diff --git a/protocols/openflow/ctl/pom.xml b/protocols/openflow/ctl/pom.xml index 5de09009b1..c21b0f6428 100644 --- a/protocols/openflow/ctl/pom.xml +++ b/protocols/openflow/ctl/pom.xml @@ -115,7 +115,7 @@ false - META-INF/native/libnetty_transport_native_epoll_x86_64.so;osname=linux;processor=x86_64, + META-INF/native/libnetty-transport-native-epoll.so;osname=linux;processor=x86_64, *