Revert "Re-enabled TLS netty"
This reverts commit 1a37866929ca05acba71cdadad87dd563b6064dd.
Change-Id: I04cdfe02f70b608b1951c4dee38cb4e345f198d5
diff --git a/tools/package/etc/org.apache.karaf.features.cfg b/tools/package/etc/org.apache.karaf.features.cfg
index 56eca2a..4b77351 100644
--- a/tools/package/etc/org.apache.karaf.features.cfg
+++ b/tools/package/etc/org.apache.karaf.features.cfg
@@ -30,24 +30,22 @@
#
# Comma separated list of features to install at startup
-# Groups of features within parens are brought up in parallel
-# Groups of features are brought up sequentially
-# Features without a paren group are assigned to an implicit paren group that ends when the next paren is found
#
featuresBoot = \
- (instance/4.2.1, \
- package/4.2.1, \
- log/4.2.1, \
- framework/4.2.1, \
- system/4.2.1, \
- eventadmin/4.2.1, \
- feature/4.2.1, \
- shell/4.2.1, \
- management/4.2.1, \
- service/4.2.1, \
- jaas/4.2.1, \
- deployer/4.2.1, \
- diagnostic/4.2.1), \
+ instance/4.2.1, \
+ package/4.2.1, \
+ log/4.2.1, \
+ ssh/4.2.1, \
+ framework/4.2.1, \
+ system/4.2.1, \
+ eventadmin/4.2.1, \
+ feature/4.2.1, \
+ shell/4.2.1, \
+ management/4.2.1, \
+ service/4.2.1, \
+ jaas/4.2.1, \
+ deployer/4.2.1, \
+ diagnostic/4.2.1, \
(wrap/2.5.4), \
(bundle/4.2.1, \
config/4.2.1, \
diff --git a/tools/package/features/BUILD b/tools/package/features/BUILD
index a0c9186..7d31d25 100644
--- a/tools/package/features/BUILD
+++ b/tools/package/features/BUILD
@@ -8,27 +8,6 @@
)
osgi_feature(
- name = "onos-netty",
- description = "ONOS Netty dependencies",
- included_bundles = [
- "@io_netty_netty//jar",
- "@io_netty_netty_common//jar",
- "@io_netty_netty_buffer//jar",
- "@io_netty_netty_handler//jar",
- "@io_netty_netty_tcnative_boringssl//jar",
- "@io_netty_netty_codec//jar",
- "@io_netty_netty_codec_http//jar",
- "@io_netty_netty_codec_http2//jar",
- "@io_netty_netty_transport//jar",
- "@io_netty_netty_transport_native_epoll//jar",
- "@io_netty_netty_transport_native_unix_common//jar",
- "@io_netty_netty_resolver//jar",
- ],
- required_features = [],
- visibility = ["//visibility:public"],
-)
-
-osgi_feature(
name = "onos-thirdparty-base",
description = "ONOS 3rd party dependencies",
included_bundles = ATOMIX + [
@@ -38,6 +17,15 @@
"@commons_codec//jar",
"@commons_configuration//jar",
"@com_google_guava_guava//jar",
+ "@io_netty_netty//jar",
+ "@io_netty_netty_common//jar",
+ "@io_netty_netty_buffer//jar",
+ "@io_netty_netty_transport//jar",
+ "@io_netty_netty_handler//jar",
+ "@io_netty_netty_codec//jar",
+ "@io_netty_netty_transport_native_epoll//jar",
+ "@io_netty_netty_transport_native_unix_common//jar",
+ "@io_netty_netty_resolver//jar",
"@commons_pool//jar",
"@commons_math3//jar",
"@joda_time//jar",
@@ -65,7 +53,7 @@
"@org_osgi_util_function//jar",
"@org_osgi_util_promise//jar",
],
- required_features = ["onos-netty"],
+ required_features = [],
visibility = ["//visibility:public"],
)