From ac9944ccee7e085cba3c0addd7d8584f3863631f Mon Sep 17 00:00:00 2001
From: joewitt <joewitt@apache.org>
Date: Mon, 23 Apr 2018 12:23:18 -0400
Subject: [PATCH] NIFI-5108 Updated all explicit refs and media nar usage of
 commons-compress to latest version and updated spring redis client

This closes #2651.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
---
 nifi-commons/nifi-flowfile-packager/pom.xml               | 2 +-
 nifi-nar-bundles/nifi-framework-bundle/pom.xml            | 4 ++--
 .../nifi-media-bundle/nifi-media-processors/pom.xml       | 8 +++++++-
 nifi-nar-bundles/nifi-redis-bundle/pom.xml                | 2 +-
 nifi-nar-bundles/nifi-standard-bundle/pom.xml             | 4 ++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi-commons/nifi-flowfile-packager/pom.xml
index b06c83440c..0622bc2d4b 100644
--- a/nifi-commons/nifi-flowfile-packager/pom.xml
+++ b/nifi-commons/nifi-flowfile-packager/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.15</version>
+            <version>1.16.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index d5425e40a5..e164519464 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -194,7 +194,7 @@
             <dependency>
                 <groupId>org.apache.tika</groupId>
                 <artifactId>tika-core</artifactId>
-                <version>1.16</version>
+                <version>1.17</version>
             </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
@@ -594,7 +594,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
-                <version>1.15</version>
+                <version>1.16.1</version>
             </dependency>
             <dependency>
                 <groupId>commons-net</groupId>
diff --git a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
index aa236a0ba9..60706537d6 100644
--- a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-parsers</artifactId>
-            <version>1.16</version>
+            <version>1.17</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>
@@ -66,6 +66,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- Once Tika-Parsers 1.18 comes out this explicit dependency ref forcing 1.16.1 can be removed -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.16.1</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/nifi-nar-bundles/nifi-redis-bundle/pom.xml b/nifi-nar-bundles/nifi-redis-bundle/pom.xml
index abf2f26a6c..e48ec39182 100644
--- a/nifi-nar-bundles/nifi-redis-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-redis-bundle/pom.xml
@@ -28,7 +28,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <spring.data.redis.version>1.8.3.RELEASE</spring.data.redis.version>
+        <spring.data.redis.version>1.8.11.RELEASE</spring.data.redis.version>
     </properties>
 
     <modules>
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index a8d2885987..01d888fc00 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -169,7 +169,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
-                <version>1.15</version>
+                <version>1.16.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -270,7 +270,7 @@
             <dependency>
                 <groupId>org.apache.tika</groupId>
                 <artifactId>tika-core</artifactId>
-                <version>1.16</version>
+                <version>1.17</version>
             </dependency>
             <dependency>
                 <groupId>com.squareup.okhttp3</groupId>