This is an automated email from the ASF dual-hosted git repository.
mthomsen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 95f5b22 Removed guava test dependency as it doesn't look like any of
the test code requires it.
95f5b22 is described below
commit 95f5b2278ca44b0a6d1be208cf404fae102c81e0
Author: thenatog <[email protected]>
AuthorDate: Mon Jun 10 14:33:37 2019 -0400
Removed guava test dependency as it doesn't look like any of the test code
requires it.
NIFI-5562 - Removed unnecessary usage of Guava
NIFI-5562 - Updated Guava version to 28.0-jre
NIFI-5562 - Upgraded Guava to 28.0-jre and Curator to 4.2.0
This closes #3577
Signed-off-by: Mike Thomsen <[email protected]>
---
.../nifi-datadog-reporting-task/pom.xml | 2 +-
.../nifi-enrich-processors/pom.xml | 2 +-
.../nifi-evtx-bundle/nifi-evtx-processors/pom.xml | 2 +-
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 18 +++++++++++++---
.../nifi-ignite-processors/pom.xml | 6 ------
.../nifi-influxdb-processors/pom.xml | 2 +-
.../nifi-kite-bundle/nifi-kite-processors/pom.xml | 2 +-
.../nifi-kudu-bundle/nifi-kudu-processors/pom.xml | 6 ------
.../org/apache/nifi/processors/kudu/PutKudu.java | 2 --
.../nifi-mongodb-processors/pom.xml | 2 +-
.../nifi-rethinkdb-processors/pom.xml | 6 ------
.../processors/rethinkdb/TestDeleteRethinkDB.java | 25 +++++++++++-----------
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +-
nifi-toolkit/nifi-toolkit-admin/pom.xml | 2 +-
.../nifi-toolkit-zookeeper-migrator/pom.xml | 2 +-
15 files changed, 36 insertions(+), 45 deletions(-)
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 90f4eaf..9d1558e 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
@@ -61,7 +61,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>19.0</version>
+ <version>28.0-jre</version>
</dependency>
<!-- test dependencies -->
<dependency>
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 a6e027a..2df2606 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
@@ -68,7 +68,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>28.0-jre</version>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml
b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml
index daae745..a625fa7 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>28.0-jre</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index e2366ac..825ebd5 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -320,7 +320,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>28.0-jre</version>
</dependency>
<!-- open id connect - override transitive dependency version
ranges -->
@@ -592,12 +592,24 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
- <version>2.11.0</version>
+ <version>4.2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
- <version>2.11.0</version>
+ <version>4.2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
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 71515ea..77ddb64 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
@@ -77,11 +77,5 @@
<version>1.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>26.0-jre</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
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 70c093e..3a1bd38 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
@@ -59,7 +59,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>28.0-jre</version>
<scope>test</scope>
</dependency>
</dependencies>
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 222eb4f..f0d7392 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
@@ -186,7 +186,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>28.0-jre</version>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
index 1ef69f1..92664ff 100644
--- a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
@@ -58,12 +58,6 @@
<artifactId>nifi-record</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>18.0</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils</artifactId>
<version>1.10.0-SNAPSHOT</version>
diff --git
a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/src/main/java/org/apache/nifi/processors/kudu/PutKudu.java
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/src/main/java/org/apache/nifi/processors/kudu/PutKudu.java
index a2889c7..900d3d3 100644
---
a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/src/main/java/org/apache/nifi/processors/kudu/PutKudu.java
+++
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/src/main/java/org/apache/nifi/processors/kudu/PutKudu.java
@@ -17,7 +17,6 @@
package org.apache.nifi.processors.kudu;
-import com.google.common.annotations.VisibleForTesting;
import org.apache.kudu.ColumnSchema;
import org.apache.kudu.Schema;
import org.apache.kudu.Type;
@@ -427,7 +426,6 @@ public class PutKudu extends AbstractProcessor {
return insert;
}
- @VisibleForTesting
void buildPartialRow(Schema schema, PartialRow row, Record record,
List<String> fieldNames) {
for (String colName : fieldNames) {
int colIdx = this.getColumnIndex(schema, colName);
diff --git
a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/pom.xml
b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/pom.xml
index d2e9da4..b5b08f4 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>28.0-jre</version>
<scope>test</scope>
</dependency>
<dependency>
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 43ef972..b96f239 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
@@ -62,11 +62,5 @@
<version>1.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>18.0</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git
a/nifi-nar-bundles/nifi-rethinkdb-bundle/nifi-rethinkdb-processors/src/test/java/org/apache/nifi/processors/rethinkdb/TestDeleteRethinkDB.java
b/nifi-nar-bundles/nifi-rethinkdb-bundle/nifi-rethinkdb-processors/src/test/java/org/apache/nifi/processors/rethinkdb/TestDeleteRethinkDB.java
index 4c06f48..eef4672 100644
---
a/nifi-nar-bundles/nifi-rethinkdb-bundle/nifi-rethinkdb-processors/src/test/java/org/apache/nifi/processors/rethinkdb/TestDeleteRethinkDB.java
+++
b/nifi-nar-bundles/nifi-rethinkdb-bundle/nifi-rethinkdb-processors/src/test/java/org/apache/nifi/processors/rethinkdb/TestDeleteRethinkDB.java
@@ -16,13 +16,8 @@
*/
package org.apache.nifi.processors.rethinkdb;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.google.gson.Gson;
+import com.rethinkdb.net.Connection;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
@@ -30,9 +25,13 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.collect.Lists;
-import com.google.gson.Gson;
-import com.rethinkdb.net.Connection;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
public class TestDeleteRethinkDB {
private static final String DOCUMENT_ID = "id1";
@@ -57,8 +56,8 @@ public class TestDeleteRethinkDB {
document.put(DeleteRethinkDB.RESULT_DELETED_KEY, 1L);
document.put(DeleteRethinkDB.RESULT_ERROR_KEY, 0L);
- document.put(DeleteRethinkDB.RESULT_CHANGES_KEY, Lists.asList(
- "[{new_val=null, old_val={id=1, value=one}}]", new String[]
{}));
+ document.put(DeleteRethinkDB.RESULT_CHANGES_KEY, Arrays.asList(
+ "[{new_val=null, old_val={id=1, value=one}}]"));
document.put(DeleteRethinkDB.RESULT_INSERTED_KEY, 0L);
document.put(DeleteRethinkDB.RESULT_REPLACED_KEY, 0L);
document.put(DeleteRethinkDB.RESULT_SKIPPED_KEY, 0L);
@@ -207,7 +206,7 @@ public class TestDeleteRethinkDB {
String json =
gson.toJson(((List)document.get(DeleteRethinkDB.RESULT_CHANGES_KEY)).get(0));
List<MockFlowFile> flowFiles =
runner.getFlowFilesForRelationship(AbstractRethinkDBProcessor.REL_SUCCESS);
- flowFiles.get(0).assertContentEquals(json.toString());
+ flowFiles.get(0).assertContentEquals(json);
assertNull(flowFiles.get(0).getAttribute(AbstractRethinkDBProcessor.RETHINKDB_ERROR_MESSAGE));
}
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 79bc252..59fa62c 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -296,7 +296,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>28.0-jre</version>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
diff --git a/nifi-toolkit/nifi-toolkit-admin/pom.xml
b/nifi-toolkit/nifi-toolkit-admin/pom.xml
index 1ea0aac..0d41bb9 100644
--- a/nifi-toolkit/nifi-toolkit-admin/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-admin/pom.xml
@@ -29,7 +29,7 @@ language governing permissions and limitations under the
License. -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>28.0-jre</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
index d760d49..475947f 100644
--- a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>28.0-jre</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
