NIFI-7187 adding missing version strings from accumulo bundle pom

- Removed Cat X JSON.org dep inclusion which seems to not be necessary - Updated a ton of easier/safer looking deps - Updated tika due to CVE This closes apache#4086 Signed-off-by: Mark Payne <[email protected]>
gresockj · Mar 20, 2020 · f694e64 · f694e64
1 parent 23fa2d3
commit f694e64
Show file tree

Hide file tree

Showing 65 changed files with 126 additions and 114 deletions.
diff --git 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.19</version>
+            <version>1.20</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/nifi-commons/nifi-metrics/pom.xml b/nifi-commons/nifi-metrics/pom.xml
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-jvm</artifactId>
-            <version>4.1.0</version>
+            <version>4.1.2</version>
         </dependency>
         <dependency>
             <groupId>org.spockframework</groupId>

diff --git a/nifi-commons/nifi-record-path/pom.xml b/nifi-commons/nifi-record-path/pom.xml
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
-            <version>2.6.2</version>
+            <version>2.8.1</version>
         </dependency>
   </dependencies>
 </project>
diff --git a/nifi-commons/nifi-rocksdb-utils/pom.xml b/nifi-commons/nifi-rocksdb-utils/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.rocksdb</groupId>
             <artifactId>rocksdbjni</artifactId>
-            <version>6.2.2</version>
+            <version>6.6.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/nifi-commons/nifi-schema-utils/pom.xml b/nifi-commons/nifi-schema-utils/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.8.1</version>
+            <version>3.9</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/nifi-commons/nifi-security-utils/pom.xml b/nifi-commons/nifi-security-utils/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.8.1</version>
+            <version>3.9</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-configuration2</artifactId>
-            <version>2.4</version>
+            <version>2.6</version>
         </dependency>
     </dependencies>
 

diff --git a/nifi-commons/nifi-socket-utils/pom.xml b/nifi-commons/nifi-socket-utils/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.8.1</version>
+            <version>3.9</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
@@ -40,10 +40,12 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-accumulo-processors</artifactId>
+                <version>1.12.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-services</artifactId>
+                <version>1.12.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/pom.xml b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/pom.xml
@@ -20,7 +20,7 @@ language governing permissions and limitations under the License. -->
     <packaging>jar</packaging>
 
     <properties>
-        <amqp-client.version>5.6.0</amqp-client.version>
+        <amqp-client.version>5.8.0</amqp-client.version>
     </properties>
 
     <dependencies>

diff --git a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.coursera</groupId>
             <artifactId>metrics-datadog</artifactId>
-            <version>1.1.5</version>
+            <version>1.1.14</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml
@@ -42,12 +42,12 @@
         <dependency>
             <groupId>org.jeasy</groupId>
             <artifactId>easy-rules-core</artifactId>
-            <version>3.3.0</version>
+            <version>3.4.0</version>
         </dependency>
         <dependency>
             <groupId>org.jeasy</groupId>
             <artifactId>easy-rules-mvel</artifactId>
-            <version>3.3.0</version>
+            <version>3.4.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.jeasy</groupId>
             <artifactId>easy-rules-spel</artifactId>
-            <version>3.3.0</version>
+            <version>3.4.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
@@ -120,7 +120,7 @@
         <dependency>
             <groupId>com.icegreen</groupId>
             <artifactId>greenmail</artifactId>
-            <version>1.5.9</version>
+            <version>1.5.11</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.8.1</version>
+            <version>3.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -74,13 +74,13 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>2.0.2</version>
+            <version>2.0.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito2</artifactId>
-            <version>2.0.2</version>
+            <version>2.0.5</version>
             <scope>test</scope>
             </dependency>
         <dependency>
@@ -103,7 +103,7 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-core</artifactId>
-            <version>2.0.2</version>
+            <version>2.0.5</version>
             <scope>test</scope>
             <exclusions>
                 <!-- bytebuddy excluded due to the transitive dependency version (1.9.3) not being able to mock
@@ -122,13 +122,13 @@
             <!-- included explicitly for use with mockito-core and powermock-core -->
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
-            <version>1.9.10</version>
+            <version>1.10.8</version>
         </dependency>
         <dependency>
             <!-- included explicitly for use with mockito-core and powermock-core -->
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy-agent</artifactId>
-            <version>1.9.10</version>
+            <version>1.10.8</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>

diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
-            <version>2.6.2</version>
+            <version>2.8.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
-            <version>2.6.2</version>
+            <version>2.8.1</version>
         </dependency>
         <!-- Other modules using nifi-avro-record-utils are expected to have these APIs available, typically through a NAR dependency -->
         <dependency>

diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/pom.xml
@@ -54,12 +54,12 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-csv</artifactId>
-            <version>1.6</version>
+            <version>1.8</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.6</version>
+            <version>1.8</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>

diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.8.1</version>
+            <version>3.9</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
@@ -260,7 +260,7 @@
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
-            <version>1.0.1</version>
+            <version>2.8.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
@@ -179,12 +179,12 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.6</version>
+            <version>1.8</version>
         </dependency>
         <dependency>
             <groupId>com.github.stefanbirkner</groupId>
             <artifactId>system-rules</artifactId>
-            <version>1.18.0</version>
+            <version>1.19.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...eb-security/src/test/java/org/apache/nifi/web/security/headers/HTTPHeaderFiltersTest.java b/...eb-security/src/test/java/org/apache/nifi/web/security/headers/HTTPHeaderFiltersTest.java
@@ -32,7 +32,7 @@
 public class HTTPHeaderFiltersTest {
 
     @Test
-    public void testCSPHeaderApplied() throws ServletException, IOException {
+    public void testCSPHeaderApplied() throws ServletException, IOException, Exception {
         // Arrange
 
         FilterHolder originFilter = new FilterHolder(new ContentSecurityPolicyFilter());
@@ -43,14 +43,16 @@ public void testCSPHeaderApplied() throws ServletException, IOException {
         FilterChain mockFilterChain = Mockito.mock(FilterChain.class);
 
         // Action
+        originFilter.start();
+        originFilter.initialize();
         originFilter.getFilter().doFilter(mockRequest, mockResponse, mockFilterChain);
 
         // Verify
         assertEquals("frame-ancestors 'self'", mockResponse.getHeader("Content-Security-Policy"));
     }
 
     @Test
-    public void testCSPHeaderAppliedOnlyOnce() throws ServletException, IOException {
+    public void testCSPHeaderAppliedOnlyOnce() throws ServletException, IOException, Exception {
         // Arrange
 
         FilterHolder originFilter = new FilterHolder(new ContentSecurityPolicyFilter());
@@ -61,6 +63,8 @@ public void testCSPHeaderAppliedOnlyOnce() throws ServletException, IOException
         FilterChain mockFilterChain = Mockito.mock(FilterChain.class);
 
         // Action
+        originFilter.start();
+        originFilter.initialize();
         originFilter.getFilter().doFilter(mockRequest, mockResponse, mockFilterChain);
         originFilter.getFilter().doFilter(mockRequest, mockResponse, mockFilterChain);
 
@@ -70,7 +74,7 @@ public void testCSPHeaderAppliedOnlyOnce() throws ServletException, IOException
 
 
     @Test
-    public void testXFrameOptionsHeaderApplied() throws ServletException, IOException {
+    public void testXFrameOptionsHeaderApplied() throws ServletException, IOException, Exception {
         // Arrange
 
         FilterHolder xfoFilter = new FilterHolder(new XFrameOptionsFilter());
@@ -81,14 +85,16 @@ public void testXFrameOptionsHeaderApplied() throws ServletException, IOExceptio
         FilterChain mockFilterChain = Mockito.mock(FilterChain.class);
 
         // Action
+        xfoFilter.start();
+        xfoFilter.initialize();
         xfoFilter.getFilter().doFilter(mockRequest, mockResponse, mockFilterChain);
 
         // Verify
         assertEquals("SAMEORIGIN", mockResponse.getHeader("X-Frame-Options"));
     }
 
     @Test
-    public void testHSTSHeaderApplied() throws ServletException, IOException {
+    public void testHSTSHeaderApplied() throws ServletException, IOException, Exception {
         // Arrange
 
         FilterHolder hstsFilter = new FilterHolder(new StrictTransportSecurityFilter());
@@ -99,14 +105,16 @@ public void testHSTSHeaderApplied() throws ServletException, IOException {
         FilterChain mockFilterChain = Mockito.mock(FilterChain.class);
 
         // Action
+        hstsFilter.start();
+        hstsFilter.initialize();
         hstsFilter.getFilter().doFilter(mockRequest, mockResponse, mockFilterChain);
 
         // Verify
         assertEquals("max-age=31540000", mockResponse.getHeader("Strict-Transport-Security"));
     }
 
     @Test
-    public void testXSSProtectionHeaderApplied() throws ServletException, IOException {
+    public void testXSSProtectionHeaderApplied() throws ServletException, IOException, Exception {
         // Arrange
 
         FilterHolder xssFilter = new FilterHolder(new XSSProtectionFilter());
@@ -117,6 +125,8 @@ public void testXSSProtectionHeaderApplied() throws ServletException, IOExceptio
         FilterChain mockFilterChain = Mockito.mock(FilterChain.class);
 
         // Action
+        xssFilter.start();
+        xssFilter.initialize();
         xssFilter.getFilter().doFilter(mockRequest, mockResponse, mockFilterChain);
 
         // Verify