Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 #4086

Signed-off-by: Mark Payne <markap14@hotmail.com>
This commit is contained in:
Joe Witt 2020-02-23 15:44:28 -08:00 committed by Mark Payne
parent 23fa2d3138
commit f694e6464f
65 changed files with 126 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-commons/nifi-flowfile-packager/pom.xml
View File

@ -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>

2
nifi-commons/nifi-metrics/pom.xml
View File

@ -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>

2
nifi-commons/nifi-record-path/pom.xml
View File

@ -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>

2
nifi-commons/nifi-rocksdb-utils/pom.xml
View File

@ -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>

2
nifi-commons/nifi-schema-utils/pom.xml
View File

@ -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>

4
nifi-commons/nifi-security-utils/pom.xml
View File

@ -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>

2
nifi-commons/nifi-socket-utils/pom.xml
View File

@ -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>

2
nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
View File

@ -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>

2
nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/pom.xml
View File

@ -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>

2
nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml
View File

@ -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>

6
nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml
View File

@ -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>

2
nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
View File

@ -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>

12
nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml
View File

@ -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>

2
nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml
View File

@ -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>

2
nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml
View File

@ -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>

4
nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/pom.xml
View File

@ -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>

2
nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/pom.xml
View File

@ -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>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
View File

@ -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>

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
View File

@ -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>

20
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/headers/HTTPHeaderFiltersTest.java
View File

@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals;
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 class HTTPHeaderFiltersTest {
FilterChain mockFilterChain = Mockito.mock(FilterChain.class);
// Action
originFilter.start();
originFilter.initialize();
originFilter.getFilter().doFilter(mockRequest, mockResponse, mockFilterChain);
// Verify
@ -50,7 +52,7 @@ public class HTTPHeaderFiltersTest {
}
@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 class HTTPHeaderFiltersTest {
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 class HTTPHeaderFiltersTest {
@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 class HTTPHeaderFiltersTest {
FilterChain mockFilterChain = Mockito.mock(FilterChain.class);
// Action
xfoFilter.start();
xfoFilter.initialize();
xfoFilter.getFilter().doFilter(mockRequest, mockResponse, mockFilterChain);
// Verify
@ -88,7 +94,7 @@ public class HTTPHeaderFiltersTest {
}
@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 class HTTPHeaderFiltersTest {
FilterChain mockFilterChain = Mockito.mock(FilterChain.class);
// Action
hstsFilter.start();
hstsFilter.initialize();
hstsFilter.getFilter().doFilter(mockRequest, mockResponse, mockFilterChain);
// Verify
@ -106,7 +114,7 @@ public class HTTPHeaderFiltersTest {
}
@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 class HTTPHeaderFiltersTest {
FilterChain mockFilterChain = Mockito.mock(FilterChain.class);
// Action
xssFilter.start();
xssFilter.initialize();
xssFilter.getFilter().doFilter(mockRequest, mockResponse, mockFilterChain);
// Verify

16
nifi-nar-bundles/nifi-framework-bundle/pom.xml
View File

@ -207,7 +207,7 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>1.22</version>
<version>1.24</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@ -271,12 +271,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
<version>3.9</version>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>2.2.1</version>
<version>2.3.2</version>
<exclusions>
<!-- | Exclude the quartz 2.2.1 bundled version of c3p0
because it is lgpl licensed | We also don't use the JDBC related features
@ -290,7 +290,7 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.16</version>
<version>1.6.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@ -342,7 +342,7 @@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>lang-tag</artifactId>
<version>1.4.3</version>
<version>1.4.4</version>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
@ -560,7 +560,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.3</version>
<version>4.4</version>
</dependency>
<dependency>
<groupId>org.jasypt</groupId>
@ -587,7 +587,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>3.2.2</version>
<version>3.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@ -619,7 +619,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.19</version>
<version>1.20</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>

2
nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/pom.xml
View File

@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
<version>3.9</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>

2
nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml
View File

@ -38,7 +38,7 @@ language governing permissions and limitations under the License. -->
<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>

4
nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml
View File

@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
<version>3.9</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.6</version>
<version>1.8</version>
</dependency>
</dependencies>
</project>

2
nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml
View File

@ -109,7 +109,7 @@
<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>

2
nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml
View File

@ -138,7 +138,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.6.0</version>
<version>2.7.0</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>

2
nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/pom.xml
View File

@ -109,7 +109,7 @@
<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>

4
nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml
View File

@ -52,7 +52,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>
@ -61,7 +61,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.3</version>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi</groupId>

2
nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/pom.xml
View File

@ -34,7 +34,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>

2
nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/pom.xml
View File

@ -44,7 +44,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.ignite</groupId>

4
nifi-nar-bundles/nifi-influxdb-bundle/nifi-influxdb-processors/pom.xml
View File

@ -29,12 +29,12 @@
<dependency>
<groupId>org.influxdb</groupId>
<artifactId>influxdb-java</artifactId>
<version>2.15</version>
<version>2.17</version>
</dependency>
<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>

4
nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
View File

@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>5.15.8</version>
<version>5.15.11</version>
<exclusions>
<!-- -->
<exclusion>
@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.15.8</version>
<version>5.15.11</version>
<scope>test</scope>
</dependency>
<dependency>

2
nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/pom.xml
View File

@ -55,7 +55,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.nifi</groupId>

2
nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers/pom.xml
View File

@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
<version>3.9</version>
</dependency>
</dependencies>
<name>nifi-kerberos-iaa-providers</name>

2
nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml
View File

@ -283,7 +283,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.6</version>
<version>1.8</version>
</dependency>
</dependencies>

2
nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml
View File

@ -86,7 +86,7 @@
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-all</artifactId>
<version>2.0.0-M20</version>
<version>2.0.0-M24</version>
<scope>test</scope>
</dependency>
<dependency>

4
nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
View File

@ -44,12 +44,12 @@
<dependency>
<groupId>com.drewnoakes</groupId>
<artifactId>metadata-extractor</artifactId>
<version>2.11.0</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
<version>1.22</version>
<version>1.24</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>

2
nifi-nar-bundles/nifi-metrics-reporting-bundle/nifi-metrics-reporting-task/pom.xml
View File

@ -38,7 +38,7 @@
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-graphite</artifactId>
<version>4.1.0</version>
<version>4.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>

2
nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/pom.xml
View File

@ -50,7 +50,7 @@
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
<version>1.2.0</version>
<version>1.2.2</version>
</dependency>
<!-- Test dependencies -->

5
nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/common/MqttTestClient.java
View File

@ -257,6 +257,11 @@ public class MqttTestClient implements IMqttClient {
}
@Override
public void reconnect() throws MqttException {
}
@Override
public void messageArrivedComplete(int i, int i1) throws MqttException {

2
nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml
View File

@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
<version>3.9</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>

2
nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml
View File

@ -109,7 +109,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.13</version>
<scope>test</scope>
</dependency>
</dependencies>

2
nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml
View File

@ -48,7 +48,7 @@ language governing permissions and limitations under the License. -->
<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>

2
nifi-nar-bundles/nifi-rethinkdb-bundle/nifi-rethinkdb-processors/pom.xml
View File

@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
<version>3.9</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>

2
nifi-nar-bundles/nifi-riemann-bundle/nifi-riemann-processors/pom.xml
View File

@ -44,7 +44,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>

6
nifi-nar-bundles/nifi-rules-action-handler-bundle/nifi-rules-action-handler-service/pom.xml
View File

@ -54,7 +54,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>
@ -64,7 +64,7 @@
<dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId>
<version>2.4.4.Final</version>
<version>2.4.5.Final</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@ -74,7 +74,7 @@
<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.nifi</groupId>

4
nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
View File

@ -93,12 +93,12 @@
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
<version>1.10.0</version>
<version>1.10.1</version>
</dependency>
<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>

2
nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
View File

@ -144,7 +144,7 @@
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-matchers</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
<scope>test</scope>
</dependency>
</dependencies>

2
nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml
View File

@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.6</version>
<version>1.8</version>
</dependency>
</dependencies>
</project>

5
nifi-nar-bundles/nifi-spark-bundle/pom.xml
View File

@ -43,11 +43,6 @@
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.13</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20160810</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>

2
nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml
View File

@ -31,7 +31,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>

2
nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml
View File

@ -67,7 +67,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.nifi</groupId>

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
View File

@ -597,7 +597,7 @@ public class HandleHttpRequest extends AbstractProcessor {
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<Part> parts = ImmutableList.copyOf(request.getParts());
int allPartsCount = parts.size();

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java
View File

@ -223,7 +223,7 @@ public class ListenHTTPServlet extends HttpServlet {
private Set<FlowFile> handleMultipartRequest(HttpServletRequest request, ProcessSession session, String foundSubject) throws IOException, IllegalStateException, ServletException {
Set<FlowFile> 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<Part> requestParts = ImmutableList.copyOf(request.getParts());
for (int i = 0; i < requestParts.size(); i++) {
Part part = requestParts.get(i);

14
nifi-nar-bundles/nifi-standard-bundle/pom.xml
View File

@ -174,12 +174,12 @@
<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>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
<version>3.9</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
@ -249,12 +249,12 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>5.15.8</version>
<version>5.15.11</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.15.8</version>
<version>5.15.11</version>
<scope>test</scope>
</dependency>
<dependency>
@ -270,7 +270,7 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>1.22</version>
<version>1.24</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
@ -296,7 +296,7 @@
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>1.1.7.2</version>
<version>1.1.7.3</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
@ -329,7 +329,7 @@
<dependency>
<groupId>com.github.wnameless</groupId>
<artifactId>json-flattener</artifactId>
<version>0.6.0</version>
<version>0.7.1</version>
</dependency>
<dependency>
<groupId>org.apache.bval</groupId>

2
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml
View File

@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
<version>3.9</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

2
nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/pom.xml
View File

@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
<version>3.9</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

6
nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
View File

@ -53,17 +53,17 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>2.4</version>
<version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.6</version>
<version>1.8</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.3</version>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>com.maxmind.geoip2</groupId>

8
nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml
View File

@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.6</version>
<version>1.8</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
@ -106,18 +106,18 @@
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-matchers</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.6</version>
<version>1.8</version>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>2.6.2</version>
<version>2.8.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>

4
nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
View File

@ -35,12 +35,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
<version>3.9</version>
</dependency>
<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.nifi</groupId>

2
nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
View File

@ -160,7 +160,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
<version>3.9</version>
</dependency>
</dependencies>
</project>

6
nifi-toolkit/nifi-toolkit-admin/pom.xml
View File

@ -118,13 +118,13 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.19</version>
<version>1.20</version>
</dependency>
<!-- Spock testing dependencies-->
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-rules</artifactId>
<version>1.16.0</version>
<version>1.19.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -135,7 +135,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>3.2.2</version>
<version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>

2
nifi-toolkit/nifi-toolkit-api/pom.xml
View File

@ -39,7 +39,7 @@ language governing permissions and limitations under the License. -->
<artifactId>swagger-annotations</artifactId>
<!-- TODO - remove version tag here after core NiFi upgrades dependency
from com.wordnik:swagger-annotations to io.swagger:swagger-annotations. -->
<version>1.5.12</version>
<version>1.6.0</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp</groupId>

8
nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
View File

@ -59,7 +59,7 @@
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-rules</artifactId>
<version>1.16.0</version>
<version>1.19.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -82,7 +82,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.3</version>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>
@ -98,13 +98,13 @@
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-matchers</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
<scope>test</scope>
</dependency>
<dependency>

4
pom.xml
View File

@ -90,12 +90,12 @@
<inceptionYear>2014</inceptionYear>
<org.slf4j.version>1.7.30</org.slf4j.version>
<ranger.version>2.0.0</ranger.version>
<jetty.version>9.4.19.v20190610</jetty.version>
<jetty.version>9.4.26.v20200117</jetty.version>
<jackson.version>2.9.10</jackson.version>
<jackson-databind.version>2.9.10.3</jackson-databind.version>
<nifi.registry.version>0.5.0</nifi.registry.version>
<nifi.groovy.version>2.5.4</nifi.groovy.version>
<surefire.version>2.22.0</surefire.version>
<surefire.version>2.22.2</surefire.version>
<!-- The Hadoop version used by nifi-hadoop-libraries-nar and any NARs that depend on it, other NARs that need
a specific version should override this property, or use a more specific property like abc.hadoop.version -->
<hadoop.version>3.2.1</hadoop.version>