diff --git a/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi-commons/nifi-flowfile-packager/pom.xml index e1ff14b5c35b9..665a5de32266c 100644 --- a/nifi-commons/nifi-flowfile-packager/pom.xml +++ b/nifi-commons/nifi-flowfile-packager/pom.xml @@ -25,7 +25,7 @@ org.apache.commons commons-compress - 1.19 + 1.20 org.apache.commons diff --git a/nifi-commons/nifi-metrics/pom.xml b/nifi-commons/nifi-metrics/pom.xml index 71774440ef352..1aca2d3e6c2eb 100644 --- a/nifi-commons/nifi-metrics/pom.xml +++ b/nifi-commons/nifi-metrics/pom.xml @@ -68,7 +68,7 @@ io.dropwizard.metrics metrics-jvm - 4.1.0 + 4.1.2 org.spockframework diff --git a/nifi-commons/nifi-record-path/pom.xml b/nifi-commons/nifi-record-path/pom.xml index b26cec5d82e91..78014f7141107 100644 --- a/nifi-commons/nifi-record-path/pom.xml +++ b/nifi-commons/nifi-record-path/pom.xml @@ -79,7 +79,7 @@ com.github.ben-manes.caffeine caffeine - 2.6.2 + 2.8.1 diff --git a/nifi-commons/nifi-rocksdb-utils/pom.xml b/nifi-commons/nifi-rocksdb-utils/pom.xml index a6e48f61e6380..8fc0a1556f97e 100644 --- a/nifi-commons/nifi-rocksdb-utils/pom.xml +++ b/nifi-commons/nifi-rocksdb-utils/pom.xml @@ -37,7 +37,7 @@ org.rocksdb rocksdbjni - 6.2.2 + 6.6.4 diff --git a/nifi-commons/nifi-schema-utils/pom.xml b/nifi-commons/nifi-schema-utils/pom.xml index 1363a55bc33d0..f437d3028fa42 100644 --- a/nifi-commons/nifi-schema-utils/pom.xml +++ b/nifi-commons/nifi-schema-utils/pom.xml @@ -24,7 +24,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 test diff --git a/nifi-commons/nifi-security-utils/pom.xml b/nifi-commons/nifi-security-utils/pom.xml index 1b14efa963f63..cfa1e22280f24 100644 --- a/nifi-commons/nifi-security-utils/pom.xml +++ b/nifi-commons/nifi-security-utils/pom.xml @@ -37,10 +37,6 @@ nifi-utils 1.12.0-SNAPSHOT - - - - ch.qos.logback logback-classic @@ -49,7 +45,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 commons-codec @@ -92,7 +88,7 @@ org.apache.commons commons-configuration2 - 2.4 + 2.6 diff --git a/nifi-commons/nifi-socket-utils/pom.xml b/nifi-commons/nifi-socket-utils/pom.xml index ac399ccd66c2c..22d02136593f0 100644 --- a/nifi-commons/nifi-socket-utils/pom.xml +++ b/nifi-commons/nifi-socket-utils/pom.xml @@ -45,7 +45,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 commons-io 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 index 07e0a6c619cee..512cbabb7e35d 100644 --- 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. --> jar - 5.6.0 + 5.8.0 diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml index 1b5cd6b67f601..fe72b783e3585 100644 --- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml +++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml @@ -41,7 +41,7 @@ language governing permissions and limitations under the License. --> com.github.shyiko mysql-binlog-connector-java - 0.11.0 + 0.20.1 org.apache.nifi 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 index daceae7ff10c8..50e04b2d2399f 100644 --- 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 @@ org.coursera metrics-datadog - 1.1.5 + 1.1.14 com.google.guava 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 index 9a0ae5ad362be..fe7aaa2c845c0 100644 --- 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 @@ org.jeasy easy-rules-core - 3.3.0 + 3.4.0 org.jeasy easy-rules-mvel - 3.3.0 + 3.4.0 org.apache.commons @@ -57,7 +57,7 @@ org.jeasy easy-rules-spel - 3.3.0 + 3.4.0 com.fasterxml.jackson.core 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 index 299e2b8d09708..2b693d0faee9d 100644 --- 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 @@ com.icegreen greenmail - 1.5.9 + 1.5.11 test 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 index 295e4d3e08392..abb85d162d2a2 100644 --- 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 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 org.apache.nifi @@ -74,13 +74,13 @@ org.powermock powermock-module-junit4 - 2.0.2 + 2.0.5 test org.powermock powermock-api-mockito2 - 2.0.2 + 2.0.5 test @@ -103,7 +103,7 @@ org.powermock powermock-core - 2.0.2 + 2.0.5 test net.bytebuddy byte-buddy - 1.9.10 + 1.10.8 net.bytebuddy byte-buddy-agent - 1.9.10 + 1.10.8 org.apache.nifi 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 index 4b082a6651309..1ea690c779b92 100644 --- 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 @@ com.github.ben-manes.caffeine caffeine - 2.6.2 + 2.8.1 org.apache.commons 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 index ef71aa4bc7c64..0cecbe335c01f 100755 --- 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 @@ com.github.ben-manes.caffeine caffeine - 2.6.2 + 2.8.1 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 index 0299044746473..0f93fc16a78fe 100644 --- 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 @@ org.apache.commons commons-csv - 1.6 + 1.8 org.apache.commons commons-text - 1.6 + 1.8 org.apache.nifi 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 index 0122e66183ae9..b0a410ae99ce9 100644 --- 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 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 org.glassfish 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 index e003264ce2c2d..09fbe7b9883a9 100644 --- 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 @@ com.github.ben-manes.caffeine caffeine - 1.0.1 + 2.8.1 compile diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-stateless/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-stateless/pom.xml index f71cdf6411dbc..68a3c9ffa45f6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-stateless/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-stateless/pom.xml @@ -73,7 +73,7 @@ org.slf4j slf4j-api - 1.7.25 + 1.7.30 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 index 2f810d5ce972a..7b300f6508de6 100644 --- 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 @@ org.apache.commons commons-text - 1.6 + 1.8 com.github.stefanbirkner system-rules - 1.18.0 + 1.19.0 test diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/headers/HTTPHeaderFiltersTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/headers/HTTPHeaderFiltersTest.java index 5744b528989d4..05a1231c4fac3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/headers/HTTPHeaderFiltersTest.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-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,6 +43,8 @@ public void testCSPHeaderApplied() throws ServletException, IOException { FilterChain mockFilterChain = Mockito.mock(FilterChain.class); // Action + originFilter.start(); + originFilter.initialize(); originFilter.getFilter().doFilter(mockRequest, mockResponse, mockFilterChain); // Verify @@ -50,7 +52,7 @@ public void testCSPHeaderApplied() throws ServletException, IOException { } @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,6 +85,8 @@ public void testXFrameOptionsHeaderApplied() throws ServletException, IOExceptio FilterChain mockFilterChain = Mockito.mock(FilterChain.class); // Action + xfoFilter.start(); + xfoFilter.initialize(); xfoFilter.getFilter().doFilter(mockRequest, mockResponse, mockFilterChain); // Verify @@ -88,7 +94,7 @@ public void testXFrameOptionsHeaderApplied() throws ServletException, IOExceptio } @Test - public void testHSTSHeaderApplied() throws ServletException, IOException { + public void testHSTSHeaderApplied() throws ServletException, IOException, Exception { // Arrange FilterHolder hstsFilter = new FilterHolder(new StrictTransportSecurityFilter()); @@ -99,6 +105,8 @@ public void testHSTSHeaderApplied() throws ServletException, IOException { FilterChain mockFilterChain = Mockito.mock(FilterChain.class); // Action + hstsFilter.start(); + hstsFilter.initialize(); hstsFilter.getFilter().doFilter(mockRequest, mockResponse, mockFilterChain); // Verify @@ -106,7 +114,7 @@ public void testHSTSHeaderApplied() throws ServletException, IOException { } @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 diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 7f0b3d6d42e8b..c974af828d1d1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -207,7 +207,7 @@ org.apache.tika tika-core - 1.22 + 1.23 commons-codec @@ -271,12 +271,12 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 org.quartz-scheduler quartz - 2.2.1 + 2.3.2 org.apache.commons commons-lang3 - 3.8.1 + 3.9 commons-io diff --git a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml index 973ca76c9a507..8d13a0b0a12b1 100644 --- a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml @@ -55,7 +55,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 com.fasterxml.jackson.core @@ -88,7 +88,7 @@ org.apache.commons commons-text - 1.6 + 1.8 diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml index e4f7efa8f2f6c..9b9b2e746ec65 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml @@ -109,7 +109,7 @@ org.apache.commons commons-text - 1.6 + 1.8 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml index ad484d86709ec..a90c83ca2ac2e 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml @@ -138,7 +138,7 @@ org.apache.commons commons-dbcp2 - 2.6.0 + 2.7.0 org.hamcrest diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/pom.xml index a326b2e2e8bef..49f43eb873db8 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/pom.xml @@ -109,7 +109,7 @@ org.apache.commons commons-text - 1.6 + 1.8 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml b/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml index 046aa53367d97..222d38d620e4d 100644 --- a/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml @@ -52,7 +52,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 org.apache.nifi @@ -61,7 +61,7 @@ commons-beanutils commons-beanutils - 1.9.3 + 1.9.4 ca.uhn.hapi diff --git a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/pom.xml b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/pom.xml index 639be8b44d20a..82300b11fbf00 100644 --- a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/pom.xml +++ b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/pom.xml @@ -34,7 +34,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/pom.xml b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/pom.xml index 37fbcc0d0d64d..d7da3826f3d0d 100644 --- a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/pom.xml +++ b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/pom.xml @@ -44,7 +44,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 org.apache.ignite diff --git a/nifi-nar-bundles/nifi-influxdb-bundle/nifi-influxdb-processors/pom.xml b/nifi-nar-bundles/nifi-influxdb-bundle/nifi-influxdb-processors/pom.xml index dddfbad32626c..a62829bf715b4 100644 --- a/nifi-nar-bundles/nifi-influxdb-bundle/nifi-influxdb-processors/pom.xml +++ b/nifi-nar-bundles/nifi-influxdb-bundle/nifi-influxdb-processors/pom.xml @@ -29,12 +29,12 @@ org.influxdb influxdb-java - 2.15 + 2.17 org.apache.commons commons-lang3 - 3.8.1 + 3.9 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml index c046eabf59a50..26bb72f412feb 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml @@ -51,7 +51,7 @@ org.apache.activemq activemq-client - 5.15.8 + 5.15.11 @@ -64,7 +64,7 @@ org.apache.activemq activemq-broker - 5.15.8 + 5.15.11 test diff --git a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/pom.xml b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/pom.xml index 7a1af3f1a63a9..ade5c1408b9bd 100644 --- a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/pom.xml +++ b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/pom.xml @@ -55,7 +55,7 @@ com.github.ben-manes.caffeine caffeine - 2.6.2 + 2.8.1 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers/pom.xml b/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers/pom.xml index 51b53210afee5..229253c074dcd 100644 --- a/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers/pom.xml +++ b/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers/pom.xml @@ -64,7 +64,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 nifi-kerberos-iaa-providers diff --git a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml index 26aad66aedb21..b1a8a120be66e 100644 --- a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml +++ b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml @@ -60,7 +60,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 @@ -283,7 +283,7 @@ org.apache.commons commons-text - 1.6 + 1.8 diff --git a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml index adcaf491a6711..52e611a70ea44 100644 --- a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml +++ b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml @@ -86,7 +86,7 @@ org.apache.directory.server apacheds-all - 2.0.0-M20 + 2.0.0-M24 test 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 0b8398cff05dd..53fb6aa22b39d 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 @@ -44,12 +44,12 @@ com.drewnoakes metadata-extractor - 2.11.0 + 2.13.0 org.apache.tika tika-parsers - 1.22 + 1.23 com.fasterxml.jackson.core diff --git a/nifi-nar-bundles/nifi-metrics-reporting-bundle/nifi-metrics-reporting-task/pom.xml b/nifi-nar-bundles/nifi-metrics-reporting-bundle/nifi-metrics-reporting-task/pom.xml index 3632571303414..00cfae0df2bb5 100644 --- a/nifi-nar-bundles/nifi-metrics-reporting-bundle/nifi-metrics-reporting-task/pom.xml +++ b/nifi-nar-bundles/nifi-metrics-reporting-bundle/nifi-metrics-reporting-task/pom.xml @@ -38,7 +38,7 @@ io.dropwizard.metrics metrics-graphite - 4.1.0 + 4.1.2 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/pom.xml b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/pom.xml index 65563eaafe32c..e7676f49b4212 100644 --- a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/pom.xml +++ b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/pom.xml @@ -50,7 +50,7 @@ org.eclipse.paho org.eclipse.paho.client.mqttv3 - 1.2.0 + 1.2.2 diff --git a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/common/MqttTestClient.java b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/common/MqttTestClient.java index 02689d736ed66..b135dcfe44208 100644 --- a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/common/MqttTestClient.java +++ b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/common/MqttTestClient.java @@ -257,6 +257,11 @@ public void setManualAcks(boolean b) { } + @Override + public void reconnect() throws MqttException { + + } + @Override public void messageArrivedComplete(int i, int i1) throws MqttException { diff --git a/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml b/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml index cb8fbc8f26b51..ad625c78b8f55 100644 --- a/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml @@ -59,7 +59,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 org.bouncycastle diff --git a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml index a9d6bf0a15ee9..feb66fe5d3f83 100644 --- a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml +++ b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml @@ -109,7 +109,7 @@ junit junit - 4.11 + 4.13 test diff --git a/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml b/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml index 8a6c774647def..c3866e0aa7c9b 100644 --- a/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml +++ b/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml @@ -48,7 +48,7 @@ language governing permissions and limitations under the License. --> org.apache.commons commons-lang3 - 3.8.1 + 3.9 commons-io diff --git a/nifi-nar-bundles/nifi-rethinkdb-bundle/nifi-rethinkdb-processors/pom.xml b/nifi-nar-bundles/nifi-rethinkdb-bundle/nifi-rethinkdb-processors/pom.xml index 62fc9367bbae5..85878822e2114 100644 --- a/nifi-nar-bundles/nifi-rethinkdb-bundle/nifi-rethinkdb-processors/pom.xml +++ b/nifi-nar-bundles/nifi-rethinkdb-bundle/nifi-rethinkdb-processors/pom.xml @@ -49,7 +49,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 com.google.code.gson diff --git a/nifi-nar-bundles/nifi-riemann-bundle/nifi-riemann-processors/pom.xml b/nifi-nar-bundles/nifi-riemann-bundle/nifi-riemann-processors/pom.xml index 870b77dc08798..2cb660a608d2b 100644 --- a/nifi-nar-bundles/nifi-riemann-bundle/nifi-riemann-processors/pom.xml +++ b/nifi-nar-bundles/nifi-riemann-bundle/nifi-riemann-processors/pom.xml @@ -44,7 +44,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/pom.xml b/nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/pom.xml index fbb6e96c6157a..5c0905f883ac6 100644 --- a/nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/pom.xml +++ b/nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/pom.xml @@ -54,7 +54,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 org.apache.nifi @@ -64,7 +64,7 @@ org.mvel mvel2 - 2.4.4.Final + 2.4.5.Final org.springframework @@ -74,7 +74,7 @@ org.jeasy easy-rules-mvel - 3.3.0 + 3.4.0 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml index b41976bfeb943..b723acd62a871 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml @@ -93,12 +93,12 @@ org.clojure clojure - 1.10.0 + 1.10.1 org.apache.commons commons-lang3 - 3.8.1 + 3.9 commons-io diff --git a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml index 042f040d674db..2fb76f82d5034 100755 --- a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml +++ b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml @@ -144,7 +144,7 @@ org.xmlunit xmlunit-matchers - 2.6.2 + 2.6.3 test diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml index 84b929607de27..19b836ebc0b74 100644 --- a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml +++ b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml @@ -84,7 +84,7 @@ org.apache.commons commons-text - 1.6 + 1.8 diff --git a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml index 7429974f9b1bc..7bff9a7280c28 100644 --- a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml +++ b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml @@ -31,7 +31,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 commons-io diff --git a/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml b/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml index 0549a968bf274..9f377c791b85a 100644 --- a/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml +++ b/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml @@ -67,7 +67,7 @@ com.github.ben-manes.caffeine caffeine - 2.6.2 + 2.8.1 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java index 6e955344c18d8..3717a33c6c512 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java @@ -597,7 +597,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session final long requestMaxSize = context.getProperty(MULTIPART_REQUEST_MAX_SIZE).asDataSize(DataUnit.B).longValue(); final int readBufferSize = context.getProperty(MULTIPART_READ_BUFFER_SIZE).asDataSize(DataUnit.B).intValue(); String tempDir = System.getProperty("java.io.tmpdir"); - request.setAttribute(Request.__MULTIPART_CONFIG_ELEMENT, new MultipartConfigElement(tempDir, requestMaxSize, requestMaxSize, readBufferSize)); + request.setAttribute(Request.MULTIPART_CONFIG_ELEMENT, new MultipartConfigElement(tempDir, requestMaxSize, requestMaxSize, readBufferSize)); try { List parts = ImmutableList.copyOf(request.getParts()); int allPartsCount = parts.size(); diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java index 07ccd69cf0431..7c07512bbcaeb 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java @@ -223,7 +223,7 @@ private void handleException(final HttpServletRequest request, final HttpServlet private Set handleMultipartRequest(HttpServletRequest request, ProcessSession session, String foundSubject) throws IOException, IllegalStateException, ServletException { Set flowFileSet = new HashSet<>(); String tempDir = System.getProperty("java.io.tmpdir"); - request.setAttribute(Request.__MULTIPART_CONFIG_ELEMENT, new MultipartConfigElement(tempDir, multipartRequestMaxSize, multipartRequestMaxSize, multipartReadBufferSize)); + request.setAttribute(Request.MULTIPART_CONFIG_ELEMENT, new MultipartConfigElement(tempDir, multipartRequestMaxSize, multipartRequestMaxSize, multipartReadBufferSize)); List requestParts = ImmutableList.copyOf(request.getParts()); for (int i = 0; i < requestParts.size(); i++) { Part part = requestParts.get(i); diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml index f87d71c19167c..a36fe2a50a6d1 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml @@ -174,12 +174,12 @@ org.apache.commons commons-compress - 1.19 + 1.20 org.apache.commons commons-lang3 - 3.8.1 + 3.9 org.bouncycastle @@ -249,12 +249,12 @@ org.apache.activemq activemq-client - 5.15.8 + 5.15.11 org.apache.activemq activemq-broker - 5.15.8 + 5.15.11 test @@ -270,7 +270,7 @@ org.apache.tika tika-core - 1.22 + 1.23 com.squareup.okhttp3 @@ -296,7 +296,7 @@ org.xerial.snappy snappy-java - 1.1.7.2 + 1.1.7.3 com.h2database @@ -329,7 +329,7 @@ com.github.wnameless json-flattener - 0.6.0 + 0.7.1 org.apache.bval diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml index df346827e689c..42178bf76a41b 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml @@ -93,7 +93,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 org.slf4j diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/pom.xml index 3deb55f0c3c92..f46e8a2df0380 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/pom.xml @@ -91,7 +91,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 org.slf4j diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml index 2dcae4144f735..1dc448b397ebc 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml @@ -53,17 +53,17 @@ org.apache.commons commons-configuration2 - 2.4 + 2.6 org.apache.commons commons-csv - 1.6 + 1.8 commons-beanutils commons-beanutils - 1.9.3 + 1.9.4 com.maxmind.geoip2 diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml index bebed48754b17..4c6f8bcc87657 100755 --- a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml @@ -64,7 +64,7 @@ org.apache.commons commons-csv - 1.6 + 1.8 com.fasterxml.jackson.dataformat @@ -106,18 +106,18 @@ org.xmlunit xmlunit-matchers - 2.6.2 + 2.6.3 test org.apache.commons commons-text - 1.6 + 1.8 com.github.ben-manes.caffeine caffeine - 2.6.2 + 2.8.1 com.google.guava diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml index 7d9cc6e0d6181..40582b4fecb69 100644 --- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml +++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml @@ -35,12 +35,12 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 com.github.ben-manes.caffeine caffeine - 2.6.2 + 2.8.1 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml index 29b84e15e577b..8322f9ab84c88 100644 --- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml +++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml @@ -160,7 +160,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 diff --git a/nifi-toolkit/nifi-toolkit-admin/pom.xml b/nifi-toolkit/nifi-toolkit-admin/pom.xml index 7f4f57208f1dd..1c0e5014cec58 100644 --- a/nifi-toolkit/nifi-toolkit-admin/pom.xml +++ b/nifi-toolkit/nifi-toolkit-admin/pom.xml @@ -118,13 +118,13 @@ language governing permissions and limitations under the License. --> org.apache.commons commons-compress - 1.19 + 1.20 com.github.stefanbirkner system-rules - 1.16.0 + 1.19.0 test @@ -135,7 +135,7 @@ language governing permissions and limitations under the License. --> cglib cglib-nodep - 3.2.2 + 3.3.0 test diff --git a/nifi-toolkit/nifi-toolkit-api/pom.xml b/nifi-toolkit/nifi-toolkit-api/pom.xml index 3b8c38b94fd76..793c16622d3ba 100644 --- a/nifi-toolkit/nifi-toolkit-api/pom.xml +++ b/nifi-toolkit/nifi-toolkit-api/pom.xml @@ -39,7 +39,7 @@ language governing permissions and limitations under the License. --> swagger-annotations - 1.5.12 + 1.6.0 com.squareup.okhttp diff --git a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml index 522ddb7ba629c..292da28f04643 100644 --- a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml +++ b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml @@ -59,7 +59,7 @@ com.github.stefanbirkner system-rules - 1.16.0 + 1.19.0 test @@ -82,7 +82,7 @@ commons-beanutils commons-beanutils - 1.9.3 + 1.9.4 org.spockframework @@ -98,13 +98,13 @@ org.xmlunit xmlunit-core - 2.6.2 + 2.6.3 test org.xmlunit xmlunit-matchers - 2.6.2 + 2.6.3 test diff --git a/pom.xml b/pom.xml index ccef89c948a04..15ec3e98dcf20 100644 --- a/pom.xml +++ b/pom.xml @@ -91,14 +91,14 @@ UTF-8 UTF-8 2014 - 1.7.26 + 1.7.30 2.0.0 - 9.4.19.v20190610 + 9.4.26.v20200117 2.9.10 2.9.10.1 0.5.0 2.5.4 - 2.22.0 + 2.22.2 3.2.0