From f9be0a4b5b36f6df1599e62f8faf97c003242f2d Mon Sep 17 00:00:00 2001
From: Kyle Grady <Kgrady1@email.arizona.edu>
Date: Wed, 26 Sep 2018 17:06:34 -0700
Subject: [PATCH] DDF-4129 Updating netty versions and blacklisting them where
 needed (the karaf decanter bundle cassandra still uses them) (#3763)

---
 distribution/ddf-common/src/main/resources/common-bin.xml     | 2 ++
 .../ddf-common/src/main/resources/etc/blacklisted.properties  | 4 ++++
 features/pom.xml                                              | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/distribution/ddf-common/src/main/resources/common-bin.xml b/distribution/ddf-common/src/main/resources/common-bin.xml
index 8b12b92bbbc4..a690f853a5c7 100644
--- a/distribution/ddf-common/src/main/resources/common-bin.xml
+++ b/distribution/ddf-common/src/main/resources/common-bin.xml
@@ -47,6 +47,8 @@
                 <exclude>**/jetty/**/9.4.6.v20170531/*</exclude>
                 <exclude>**/jetty/**/8.1.14.v20131031/*</exclude>
                 <exclude>**/pax/web/**/7.0.0/*</exclude>
+                <exclude>**/netty/**/4.0.33.Final/*</exclude>
+                <exclude>**/netty/**/4.0.33.Final</exclude>
                 <!--
                 Since Karaf v2.2.9, Karaf includes a default user "karaf" with its own authentication key in it, thus
                 when running client script it logs in as "karaf" user without requiring a password.
diff --git a/distribution/ddf-common/src/main/resources/etc/blacklisted.properties b/distribution/ddf-common/src/main/resources/etc/blacklisted.properties
index ec36b234c45e..288b2870467d 100644
--- a/distribution/ddf-common/src/main/resources/etc/blacklisted.properties
+++ b/distribution/ddf-common/src/main/resources/etc/blacklisted.properties
@@ -9,3 +9,7 @@ pax-war-tomcat;type=feature;range=[7.0.0,7.2.2]
 pax-jsf-support;type=feature;range=[7.0.0,7.2.2]
 pax-jsf-resources-support;type=feature;range=[7.0.0,7.2.2]
 pax-http-undertow;type=feature;range=[7.0.0,7.2.2]
+
+decanter-appender-cassandra;type=feature
+decanter-appender-cassandra-core;type=feature
+
diff --git a/features/pom.xml b/features/pom.xml
index b9e3ecfeab0b..486a567e8dfe 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -138,7 +138,7 @@
         <cxf.joda.time.version>2.9.4</cxf.joda.time.version>
         <cxf.neethi.version>3.1.1</cxf.neethi.version>
         <cxf.netty.version>4.0.43.Final</cxf.netty.version>
-        <cxf.netty3.version>3.9.2.Final</cxf.netty3.version>
+        <cxf.netty3.version>3.9.9.Final</cxf.netty3.version>
         <cxf.opensaml.osgi.version>${opensaml.osgi.version}</cxf.opensaml.osgi.version>
         <cxf.reflections.bundle.version>0.9.11_2</cxf.reflections.bundle.version>
         <cxf.rhino.bundle.version>1.7R2_3</cxf.rhino.bundle.version>