From 8e233ca2ef55b2100174ee2b32a8668e9190a85c Mon Sep 17 00:00:00 2001 From: joewitt Date: Thu, 20 Sep 2018 23:24:17 -0400 Subject: [PATCH] NIFI-4806 updated tika and a ton of other deps as found by dependency versions plugin This closes #3028 --- .../src/test/resources/localhost-ks.jks | Bin .../src/test/resources/localhost-ts.jks | Bin .../nifi-data-provenance-utils/pom.xml | 2 +- nifi-commons/nifi-expression-language/pom.xml | 6 +- .../CharSequenceTranslatorEvaluator.java | 4 +- nifi-commons/nifi-flowfile-packager/pom.xml | 9 ++- .../apache/nifi/util/FlowFilePackagerV1.java | 2 +- nifi-commons/nifi-hl7-query-language/pom.xml | 18 +++--- .../org/apache/nifi/hl7/hapi/HapiField.java | 4 +- nifi-commons/nifi-json-utils/pom.xml | 2 +- nifi-commons/nifi-schema-utils/pom.xml | 2 +- nifi-commons/nifi-security-utils/pom.xml | 6 +- nifi-commons/nifi-site-to-site-client/pom.xml | 4 +- nifi-commons/nifi-socket-utils/pom.xml | 2 +- nifi-commons/nifi-web-utils/pom.xml | 10 +--- nifi-external/nifi-spark-receiver/pom.xml | 2 +- nifi-external/nifi-storm-spout/pom.xml | 2 +- .../nifi-amqp-processors/pom.xml | 2 +- .../emulator/AtlasAPIV2ServerEmulator.java | 11 ++-- .../nifi-avro-processors/pom.xml | 4 +- .../nifi-aws-abstract-processors/pom.xml | 2 +- nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +- .../nifi-cassandra-processors/pom.xml | 5 ++ .../processors/cassandra/QueryCassandra.java | 2 +- .../nifi-ccda-processors/pom.xml | 2 +- .../nifi-cdc/nifi-cdc-api/pom.xml | 4 +- .../nifi-couchbase-processors/pom.xml | 7 +-- .../nifi-druid-controller-service-api/pom.xml | 2 +- .../nifi-elasticsearch-client-service/pom.xml | 4 +- .../nifi-elasticsearch-processors/pom.xml | 4 +- .../pom.xml | 2 +- .../nifi-email-processors/pom.xml | 6 +- .../nifi-enrich-processors/pom.xml | 2 +- .../nifi-hadoop-utils/pom.xml | 2 +- .../nifi-processor-utils/pom.xml | 2 +- .../nifi-standard-record-utils/pom.xml | 5 ++ .../java/org/apache/nifi/csv/CSVUtils.java | 2 +- .../org/apache/nifi/csv/CSVValidators.java | 2 +- .../nifi-reporting-utils/pom.xml | 2 +- .../nifi-syslog-utils/pom.xml | 2 +- .../nifi-web/nifi-jetty/pom.xml | 7 ++- .../nifi/web/server/HostHeaderHandler.java | 2 +- .../nifi-framework-bundle/pom.xml | 14 ++--- .../nifi-gcp-services-api/pom.xml | 3 +- .../nifi-grpc-processors/pom.xml | 2 +- .../nifi-hbase-processors/pom.xml | 13 +++-- .../nifi/hbase/io/JsonFullRowSerializer.java | 2 +- .../JsonQualifierAndValueRowSerializer.java | 2 +- .../nifi/hbase/io/JsonRowSerializer.java | 2 +- .../nifi-hive-processors/pom.xml | 5 ++ .../apache/nifi/util/hive/HiveJdbcCommon.java | 2 +- .../apache/nifi/util/hive/HiveJdbcCommon.java | 2 +- .../nifi-hl7-processors/pom.xml | 20 +++---- .../nifi-html-processors/pom.xml | 2 +- .../nifi-ignite-processors/pom.xml | 2 +- .../nifi-influxdb-processors/pom.xml | 2 +- .../nifi-jms-processors/pom.xml | 4 +- .../nifi-jolt-record-bundle/pom.xml | 2 +- .../nifi-kerberos-iaa-providers/pom.xml | 2 +- .../nifi-kite-bundle/nifi-kite-nar/pom.xml | 2 +- .../nifi-kite-processors/pom.xml | 7 ++- .../processors/kite/ConvertCSVToAvro.java | 2 +- .../nifi/processors/kite/InferAvroSchema.java | 2 +- .../nifi-ldap-iaa-providers/pom.xml | 11 +--- .../nifi-media-processors/pom.xml | 8 +-- .../nifi-mongodb-services/pom.xml | 2 +- .../nifi-network-processors/pom.xml | 2 +- .../nifi-network-utils/pom.xml | 52 +++++++++--------- .../nifi-poi-processors/pom.xml | 2 +- .../poi/ConvertExcelToCSVProcessor.java | 2 +- ...dWriteAheadProvenanceRepositoryTest.groovy | 2 + ... ITestPersistentProvenanceRepository.java} | 2 +- .../nifi-provenance-repository-bundle/pom.xml | 4 +- .../nifi-redis-extensions/pom.xml | 2 +- .../nifi-registry-service/pom.xml | 2 +- .../nifi-rethinkdb-processors/pom.xml | 2 +- .../nifi-riemann-processors/pom.xml | 2 +- nifi-nar-bundles/nifi-riemann-bundle/pom.xml | 2 +- .../nifi-scripting-processors/pom.xml | 2 +- .../nifi-solr-processors/pom.xml | 4 +- .../nifi-livy-processors/pom.xml | 2 +- nifi-nar-bundles/nifi-splunk-bundle/pom.xml | 2 +- .../nifi-spring-processors/pom.xml | 2 +- .../nifi/processors/standard/SplitXml.java | 2 +- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 30 +++++----- .../nifi-hbase_1_1_2-client-service/pom.xml | 2 +- .../nifi-hwx-schema-registry-service/pom.xml | 4 +- .../nifi-lookup-services/pom.xml | 6 +- .../pom.xml | 14 ++--- .../apache/nifi/csv/TestCSVRecordReader.java | 2 +- .../nifi/csv/TestJacksonCSVRecordReader.java | 2 +- .../nifi-update-attribute-processor/pom.xml | 2 +- .../nifi-update-attribute-ui/pom.xml | 4 +- nifi-toolkit/nifi-toolkit-admin/pom.xml | 6 +- nifi-toolkit/nifi-toolkit-cli/pom.xml | 4 +- .../nifi-toolkit-encrypt-config/pom.xml | 4 +- nifi-toolkit/nifi-toolkit-s2s/pom.xml | 4 +- nifi-toolkit/nifi-toolkit-tls/pom.xml | 8 +-- .../nifi-toolkit-zookeeper-migrator/pom.xml | 2 +- pom.xml | 2 +- 100 files changed, 237 insertions(+), 226 deletions(-) mode change 100755 => 100644 nifi-bootstrap/src/test/resources/localhost-ks.jks mode change 100755 => 100644 nifi-bootstrap/src/test/resources/localhost-ts.jks rename nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/{TestPersistentProvenanceRepository.java => ITestPersistentProvenanceRepository.java} (99%) diff --git a/nifi-bootstrap/src/test/resources/localhost-ks.jks b/nifi-bootstrap/src/test/resources/localhost-ks.jks old mode 100755 new mode 100644 diff --git a/nifi-bootstrap/src/test/resources/localhost-ts.jks b/nifi-bootstrap/src/test/resources/localhost-ts.jks old mode 100755 new mode 100644 diff --git a/nifi-commons/nifi-data-provenance-utils/pom.xml b/nifi-commons/nifi-data-provenance-utils/pom.xml index 5598b5955e87..3fd192473989 100644 --- a/nifi-commons/nifi-data-provenance-utils/pom.xml +++ b/nifi-commons/nifi-data-provenance-utils/pom.xml @@ -45,7 +45,7 @@ org.bouncycastle bcprov-jdk15on - 1.59 + 1.60 org.apache.nifi diff --git a/nifi-commons/nifi-expression-language/pom.xml b/nifi-commons/nifi-expression-language/pom.xml index 5a5a096d6709..91a9844576b2 100644 --- a/nifi-commons/nifi-expression-language/pom.xml +++ b/nifi-commons/nifi-expression-language/pom.xml @@ -81,12 +81,12 @@ com.fasterxml.jackson.core jackson-databind - 2.9.5 + 2.9.7 org.apache.commons - commons-lang3 - 3.7 + commons-text + 1.4 diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/CharSequenceTranslatorEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/CharSequenceTranslatorEvaluator.java index 9a671c1fbee5..9f86fa45da14 100644 --- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/CharSequenceTranslatorEvaluator.java +++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/CharSequenceTranslatorEvaluator.java @@ -18,8 +18,8 @@ import java.util.Map; -import org.apache.commons.lang3.StringEscapeUtils; -import org.apache.commons.lang3.text.translate.CharSequenceTranslator; +import org.apache.commons.text.StringEscapeUtils; +import org.apache.commons.text.translate.CharSequenceTranslator; import org.apache.nifi.attribute.expression.language.evaluation.Evaluator; import org.apache.nifi.attribute.expression.language.evaluation.QueryResult; import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator; diff --git a/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi-commons/nifi-flowfile-packager/pom.xml index 99af5fbe09aa..cd995dac356e 100644 --- a/nifi-commons/nifi-flowfile-packager/pom.xml +++ b/nifi-commons/nifi-flowfile-packager/pom.xml @@ -25,12 +25,17 @@ org.apache.commons commons-compress - 1.16.1 + 1.18 org.apache.commons commons-lang3 - 3.7 + 3.8.1 + + + org.apache.commons + commons-text + 1.4 diff --git a/nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java b/nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java index 479ac588a4bc..2e73e814df6a 100644 --- a/nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java +++ b/nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java @@ -24,7 +24,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; public class FlowFilePackagerV1 implements FlowFilePackager { diff --git a/nifi-commons/nifi-hl7-query-language/pom.xml b/nifi-commons/nifi-hl7-query-language/pom.xml index ffb22a8111bb..cbe90071c465 100644 --- a/nifi-commons/nifi-hl7-query-language/pom.xml +++ b/nifi-commons/nifi-hl7-query-language/pom.xml @@ -65,47 +65,47 @@ ca.uhn.hapi hapi-base - 2.2 + 2.3 ca.uhn.hapi hapi-structures-v21 - 2.2 + 2.3 ca.uhn.hapi hapi-structures-v22 - 2.2 + 2.3 ca.uhn.hapi hapi-structures-v23 - 2.2 + 2.3 ca.uhn.hapi hapi-structures-v231 - 2.2 + 2.3 ca.uhn.hapi hapi-structures-v24 - 2.2 + 2.3 ca.uhn.hapi hapi-structures-v25 - 2.2 + 2.3 ca.uhn.hapi hapi-structures-v251 - 2.2 + 2.3 ca.uhn.hapi hapi-structures-v26 - 2.2 + 2.3 diff --git a/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/hapi/HapiField.java b/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/hapi/HapiField.java index 94cce5c1a9f0..f9624d0c440f 100644 --- a/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/hapi/HapiField.java +++ b/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/hapi/HapiField.java @@ -27,7 +27,6 @@ import ca.uhn.hl7v2.model.ExtraComponents; import ca.uhn.hl7v2.model.Primitive; import ca.uhn.hl7v2.model.Type; -import ca.uhn.hl7v2.model.Varies; import ca.uhn.hl7v2.parser.EncodingCharacters; import ca.uhn.hl7v2.parser.PipeParser; @@ -59,8 +58,7 @@ public HapiField(final Type type) { componentList.add(new SingleValueField(singleFieldValue)); for (int i = 0; i < extra.numComponents(); i++) { - final Varies varies = extra.getComponent(i); - componentList.add(new HapiField(varies)); + componentList.add(new HapiField(extra.getComponent(i))); } } diff --git a/nifi-commons/nifi-json-utils/pom.xml b/nifi-commons/nifi-json-utils/pom.xml index 655ab5195bdf..d4fdb1617eb2 100644 --- a/nifi-commons/nifi-json-utils/pom.xml +++ b/nifi-commons/nifi-json-utils/pom.xml @@ -32,7 +32,7 @@ com.fasterxml.jackson.core jackson-databind - 2.9.5 + 2.9.7 compile diff --git a/nifi-commons/nifi-schema-utils/pom.xml b/nifi-commons/nifi-schema-utils/pom.xml index 561b36f0d7c6..8c53b61a29a4 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.7 + 3.8.1 test diff --git a/nifi-commons/nifi-security-utils/pom.xml b/nifi-commons/nifi-security-utils/pom.xml index bc5bc5e4a06a..da684c5735c5 100644 --- a/nifi-commons/nifi-security-utils/pom.xml +++ b/nifi-commons/nifi-security-utils/pom.xml @@ -44,7 +44,7 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 commons-codec @@ -54,12 +54,12 @@ org.bouncycastle bcprov-jdk15on - 1.59 + 1.60 org.bouncycastle bcpkix-jdk15on - 1.59 + 1.60 org.apache.nifi diff --git a/nifi-commons/nifi-site-to-site-client/pom.xml b/nifi-commons/nifi-site-to-site-client/pom.xml index ace8db1e1a73..cf9ab8c30c5d 100644 --- a/nifi-commons/nifi-site-to-site-client/pom.xml +++ b/nifi-commons/nifi-site-to-site-client/pom.xml @@ -48,12 +48,12 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 com.fasterxml.jackson.core jackson-databind - 2.9.5 + 2.9.7 org.apache.nifi diff --git a/nifi-commons/nifi-socket-utils/pom.xml b/nifi-commons/nifi-socket-utils/pom.xml index eccf216e8d51..f4a4668ae305 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.7 + 3.8.1 commons-io diff --git a/nifi-commons/nifi-web-utils/pom.xml b/nifi-commons/nifi-web-utils/pom.xml index 2830e58ab003..4d38aad23491 100644 --- a/nifi-commons/nifi-web-utils/pom.xml +++ b/nifi-commons/nifi-web-utils/pom.xml @@ -23,7 +23,7 @@ nifi-web-utils 2.26 - 2.9.5 + 2.9.7 @@ -39,7 +39,7 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 org.glassfish.jersey.core @@ -91,12 +91,6 @@ 4.5.6 compile - - org.apache.httpcomponents - httpclient - 4.5.6 - compile - diff --git a/nifi-external/nifi-spark-receiver/pom.xml b/nifi-external/nifi-spark-receiver/pom.xml index 9a7083bcb8d3..581ee4cb7693 100644 --- a/nifi-external/nifi-spark-receiver/pom.xml +++ b/nifi-external/nifi-spark-receiver/pom.xml @@ -43,7 +43,7 @@ com.fasterxml.jackson.core jackson-databind - 2.9.5 + 2.9.7 diff --git a/nifi-external/nifi-storm-spout/pom.xml b/nifi-external/nifi-storm-spout/pom.xml index 45fc7a33cbb6..d81249f4bbf2 100644 --- a/nifi-external/nifi-storm-spout/pom.xml +++ b/nifi-external/nifi-storm-spout/pom.xml @@ -32,7 +32,7 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 org.apache.nifi 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 f317e8c69179..4a61ee4021ad 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.2.0 + 5.4.1 diff --git a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/emulator/AtlasAPIV2ServerEmulator.java b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/emulator/AtlasAPIV2ServerEmulator.java index 577e58b5be4f..b1478100bc5d 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/emulator/AtlasAPIV2ServerEmulator.java +++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/emulator/AtlasAPIV2ServerEmulator.java @@ -171,8 +171,7 @@ private void updateEntityByNotification(AtlasEntity entity) { final Object r; switch (k) { case "inputs": - case "outputs": - { + case "outputs": { // If a reference doesn't have guid, then find it. r = resolveIOReference(v); } @@ -211,7 +210,7 @@ private void createServer() throws Exception { httpConnector = new ServerConnector(server); httpConnector.setPort(21000); - server.setConnectors(new Connector[] {httpConnector}); + server.setConnectors(new Connector[]{httpConnector}); servletHandler.addServletWithMapping(TypeDefsServlet.class, "/types/typedefs/"); servletHandler.addServletWithMapping(EntityBulkServlet.class, "/entity/bulk/"); @@ -334,6 +333,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se public static class EntityGuidServlet extends HttpServlet { private static Pattern URL_PATTERN = Pattern.compile(".+/guid/([^/]+)"); + @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { final Matcher matcher = URL_PATTERN.matcher(req.getRequestURI()); @@ -358,6 +358,7 @@ private static AtlasEntity.AtlasEntityWithExtInfo createSearchResult(AtlasEntity public static class SearchByUniqueAttributeServlet extends HttpServlet { private static Pattern URL_PATTERN = Pattern.compile(".+/uniqueAttribute/type/([^/]+)"); + @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { // http://localhost:21000/api/atlas/v2/entity/uniqueAttribute/type/nifi_flow_path?attr:qualifiedName=2e9a2852-228f-379b-0000-000000000000@example @@ -479,7 +480,6 @@ private void traverse(Set seen, AtlasEntity s, List links, Ma } } - // Traverse entities those consume this entity as their input. final List outGoings = Stream.of(outgoingEntities.getOrDefault(toTypedQname(s), Collections.emptyList()), outgoingEntities.getOrDefault(s.getGuid(), Collections.emptyList())).flatMap(List::stream).collect(Collectors.toList()); @@ -567,7 +567,6 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se traverse(seen, s, links, nodeIndices, outgoingEntities); }); - } } @@ -596,7 +595,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se // Group links by its target, and configure each weight value. // E.g. 1 -> 3 and 2 -> 3, then 1 (0.5) -> 3 and 2 (0.5) -> 3. ls.stream().collect(Collectors.groupingBy(Link::getTarget)) - .forEach((t, ls2SameTgt) -> ls2SameTgt.forEach(l -> l.setValue(1.0 / (double) ls2SameTgt.size()))); + .forEach((t, ls2SameTgt) -> ls2SameTgt.forEach(l -> l.setValue(1.0 / (double) ls2SameTgt.size()))); } }); diff --git a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml index ae1758b0bda1..4776b2151251 100644 --- a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml +++ b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml @@ -34,7 +34,7 @@ language governing permissions and limitations under the License. --> org.apache.commons commons-lang3 - 3.7 + 3.8.1 org.apache.avro @@ -44,7 +44,7 @@ language governing permissions and limitations under the License. --> com.fasterxml.jackson.core jackson-databind - 2.9.5 + 2.9.7 commons-codec diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml index 5a9c35739603..cdd93250674c 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml @@ -61,7 +61,7 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/pom.xml index ed421175ea76..b3bb9437e48c 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-aws-bundle/pom.xml @@ -26,7 +26,7 @@ pom - 1.11.319 + 1.11.412 diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml index d5c36d45c0ff..3359b3dc81d9 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml @@ -79,5 +79,10 @@ nifi-mock-record-utils 1.8.0-SNAPSHOT + + org.apache.commons + commons-text + 1.4 + diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java index 40b88cc9d7a6..75a66f0a5a4e 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java @@ -33,7 +33,7 @@ import org.apache.avro.generic.GenericDatumWriter; import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.DatumWriter; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.nifi.annotation.behavior.EventDriven; import org.apache.nifi.annotation.behavior.InputRequirement; diff --git a/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-processors/pom.xml b/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-processors/pom.xml index 6aee1f3af34d..7d7dc821ec35 100644 --- a/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-processors/pom.xml +++ b/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-processors/pom.xml @@ -38,7 +38,7 @@ org.apache.commons commons-jexl3 - 3.0 + 3.1 org.openehealth.ipf.oht.mdht diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml b/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml index 21697115acd9..4abe273a531f 100644 --- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml +++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml @@ -34,12 +34,12 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 com.fasterxml.jackson.core jackson-databind - 2.9.5 + 2.9.7 diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/pom.xml b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/pom.xml index f358a92802d0..17706941f3aa 100644 --- a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/pom.xml +++ b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/pom.xml @@ -48,7 +48,7 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 org.apache.nifi @@ -62,11 +62,6 @@ org.apache.nifi nifi-record-serialization-service-api - - org.apache.nifi - nifi-utils - 1.8.0-SNAPSHOT - org.apache.nifi nifi-mock diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml index d922e97d56ae..9a7f2b371fd5 100644 --- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml +++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml @@ -130,7 +130,7 @@ org.bouncycastle bcprov-jdk15on - 1.59 + 1.60 provided diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml index b0c784284c28..5334aa2c9d86 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml @@ -66,7 +66,7 @@ com.fasterxml.jackson.core jackson-databind - 2.9.5 + 2.9.7 @@ -83,7 +83,7 @@ org.apache.commons commons-lang3 - 3.4 + 3.8.1 org.slf4j diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml index 94a07fc309d6..dfe72086604b 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml @@ -24,7 +24,7 @@ language governing permissions and limitations under the License. --> 1.7.12 2.1.0 5.3.1 - 2.9.5 + 2.9.7 @@ -63,7 +63,7 @@ language governing permissions and limitations under the License. --> org.apache.commons commons-text - 1.3 + 1.4 org.apache.lucene diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml index 54cc43129af6..eecad55c9684 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml @@ -80,7 +80,7 @@ language governing permissions and limitations under the License. --> com.fasterxml.jackson.core jackson-databind - 2.9.5 + 2.9.7 org.apache.nifi 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 cd93e2387a56..c3b3e52d6630 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 @@ -43,7 +43,7 @@ org.apache.commons commons-email - 1.4 + 1.5 com.sun.mail @@ -104,7 +104,7 @@ org.apache.poi poi-scratchpad - 3.17 + 4.0.0 org.apache.nifi @@ -120,7 +120,7 @@ com.icegreen greenmail - 1.5.2 + 1.5.8 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 6c55cce621f7..2e55a4c5d8e1 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 @@ -31,7 +31,7 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml index 8c7aa2cd747c..f1a36b0f0316 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml @@ -43,7 +43,7 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/pom.xml index 4f59729f8d5a..e4e30d92f198 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/pom.xml @@ -59,7 +59,7 @@ com.fasterxml.jackson.core jackson-databind - 2.9.5 + 2.9.7 org.apache.nifi 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 e82bf62ed61c..36f565ff60a5 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,6 +54,11 @@ org.apache.commons commons-csv + 1.5 + + + org.apache.commons + commons-text 1.4 diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/csv/CSVUtils.java b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/csv/CSVUtils.java index f379bea3827f..3f3814ee99d0 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/csv/CSVUtils.java +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/csv/CSVUtils.java @@ -19,7 +19,7 @@ import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.QuoteMode; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.nifi.components.AllowableValue; import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.components.PropertyValue; diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/csv/CSVValidators.java b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/csv/CSVValidators.java index 5979407c9f31..0f6a22f7b4f9 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/csv/CSVValidators.java +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/csv/CSVValidators.java @@ -17,7 +17,7 @@ package org.apache.nifi.csv; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.nifi.components.ValidationContext; import org.apache.nifi.components.ValidationResult; import org.apache.nifi.components.Validator; 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 87a388cb6590..681589c33d92 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.7 + 3.8.1 com.yammer.metrics diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml index dd94370aff85..e78e694c20ff 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml @@ -26,7 +26,7 @@ com.github.palindromicity simple-syslog-5424 - 0.0.7 + 0.0.8 org.apache.nifi 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 a2208263d591..4318c3850408 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 @@ -188,10 +188,15 @@ nifi-framework-cluster compile + + org.apache.commons + commons-text + 1.4 + com.github.stefanbirkner system-rules - 1.16.0 + 1.18.0 test diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java index 72e8d8425ab8..5ccf1e0a80b2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java @@ -17,7 +17,7 @@ package org.apache.nifi.web.server; import com.google.common.base.Strings; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.http.conn.util.InetAddressUtils; import org.apache.nifi.util.NiFiProperties; diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 3d82203ee5d5..60fa7ba72d2d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -27,7 +27,7 @@ 2.26 4.3.10.RELEASE 4.2.4.RELEASE - 2.9.5 + 2.9.7 nifi-framework @@ -194,7 +194,7 @@ org.apache.tika tika-core - 1.17 + 1.19 commons-codec @@ -258,7 +258,7 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 org.quartz-scheduler @@ -302,12 +302,12 @@ org.bouncycastle bcprov-jdk15on - 1.59 + 1.60 org.bouncycastle bcpkix-jdk15on - 1.59 + 1.60 com.google.guava @@ -547,7 +547,7 @@ org.apache.commons commons-collections4 - 4.1 + 4.2 org.jasypt @@ -594,7 +594,7 @@ org.apache.commons commons-compress - 1.16.1 + 1.18 commons-net diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml index 8f8979dc3d67..5515e17363dd 100644 --- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml +++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml @@ -33,7 +33,6 @@ com.google.auth google-auth-library-oauth2-http - 0.6.0 com.google.code.findbugs @@ -49,7 +48,7 @@ com.fasterxml.jackson.core jackson-databind - 2.9.5 + 2.9.7 diff --git a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml index 1ce4f004f9e6..e6d9d1e4edd9 100644 --- a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml +++ b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml @@ -38,7 +38,7 @@ language governing permissions and limitations under the License. --> org.apache.commons commons-lang3 - 3.7 + 3.8.1 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 cf6e09d21cb4..c2866fa51706 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 @@ -24,7 +24,7 @@ Support for interacting with HBase - 2.9.5 + 2.9.7 @@ -55,12 +55,12 @@ org.apache.nifi nifi-record - ${project.version} + 1.8.0-SNAPSHOT org.apache.commons commons-lang3 - 3.4 + 3.8.1 com.fasterxml.jackson.core @@ -93,7 +93,12 @@ org.apache.nifi nifi-record-path - ${project.version} + 1.8.0-SNAPSHOT + + + org.apache.commons + commons-text + 1.4 diff --git a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/io/JsonFullRowSerializer.java b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/io/JsonFullRowSerializer.java index 837f14d220a4..a51840035739 100644 --- a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/io/JsonFullRowSerializer.java +++ b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/io/JsonFullRowSerializer.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.hbase.io; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.nifi.hbase.scan.ResultCell; import org.apache.nifi.hbase.util.RowSerializerUtil; diff --git a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/io/JsonQualifierAndValueRowSerializer.java b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/io/JsonQualifierAndValueRowSerializer.java index 0eb18ffbf8b9..ee05f04b4fd9 100644 --- a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/io/JsonQualifierAndValueRowSerializer.java +++ b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/io/JsonQualifierAndValueRowSerializer.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.hbase.io; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.nifi.hbase.scan.ResultCell; import org.apache.nifi.hbase.util.RowSerializerUtil; diff --git a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/io/JsonRowSerializer.java b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/io/JsonRowSerializer.java index 0ea0804b8007..fc903e43ba74 100644 --- a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/io/JsonRowSerializer.java +++ b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/io/JsonRowSerializer.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.hbase.io; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.nifi.hbase.scan.ResultCell; import java.io.IOException; 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 fda010ee060f..30e641b216c5 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 @@ -106,6 +106,11 @@ findbugs-annotations 1.3.9-1 + + org.apache.commons + commons-text + 1.4 + org.apache.nifi nifi-mock diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java index ff06495fee97..6e28f94a67c9 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java @@ -24,7 +24,7 @@ import org.apache.avro.generic.GenericDatumWriter; import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.DatumWriter; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java index ff06495fee97..6e28f94a67c9 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java @@ -24,7 +24,7 @@ import org.apache.avro.generic.GenericDatumWriter; import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.DatumWriter; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; 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 2b43a50420a7..fb53d5ce4580 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.7 + 3.8.1 org.apache.nifi @@ -66,47 +66,47 @@ ca.uhn.hapi hapi-base - 2.2 + 2.3 ca.uhn.hapi hapi-structures-v21 - 2.2 + 2.3 ca.uhn.hapi hapi-structures-v22 - 2.2 + 2.3 ca.uhn.hapi hapi-structures-v23 - 2.2 + 2.3 ca.uhn.hapi hapi-structures-v231 - 2.2 + 2.3 ca.uhn.hapi hapi-structures-v24 - 2.2 + 2.3 ca.uhn.hapi hapi-structures-v25 - 2.2 + 2.3 ca.uhn.hapi hapi-structures-v251 - 2.2 + 2.3 ca.uhn.hapi hapi-structures-v26 - 2.2 + 2.3 org.apache.nifi 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 06bdf8844a20..25c1143b3c8c 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.7 + 3.8.1 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 0dc78808f427..fc694be5dbea 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 @@ -45,7 +45,7 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 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 aad47b903204..9e94c1ac3a04 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 @@ -34,7 +34,7 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 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 9b711ebfa56f..87ba89dcdef6 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.3 + 5.15.6 @@ -64,7 +64,7 @@ org.apache.activemq activemq-broker - 5.15.3 + 5.15.6 test diff --git a/nifi-nar-bundles/nifi-jolt-record-bundle/pom.xml b/nifi-nar-bundles/nifi-jolt-record-bundle/pom.xml index 3a7c4fae363a..b1c0c8d6f4d4 100644 --- a/nifi-nar-bundles/nifi-jolt-record-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-jolt-record-bundle/pom.xml @@ -33,7 +33,7 @@ - 2.9.5 + 2.9.7 2.2.0 0.1.1 2.26 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 008b0d8d7b96..8ac3b7a3fb1f 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 @@ -68,7 +68,7 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 nifi-kerberos-iaa-providers diff --git a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml index cb954908e3f3..a10f5a9204c8 100644 --- a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml +++ b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml @@ -97,7 +97,7 @@ commons-lang - commons-lang3 + org.apache.commons commons-lang3 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 9f87b3688291..0ff664a953c3 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.7 + 3.8.1 @@ -280,6 +280,11 @@ nifi-hadoop-utils 1.8.0-SNAPSHOT + + org.apache.commons + commons-text + 1.4 + diff --git a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertCSVToAvro.java b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertCSVToAvro.java index 3646680c37e2..bacef3b257f1 100644 --- a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertCSVToAvro.java +++ b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertCSVToAvro.java @@ -29,7 +29,7 @@ import org.apache.avro.Schema; import org.apache.avro.file.DataFileWriter; import org.apache.avro.generic.GenericData.Record; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.nifi.annotation.behavior.InputRequirement; import org.apache.nifi.annotation.behavior.InputRequirement.Requirement; import org.apache.nifi.annotation.documentation.CapabilityDescription; diff --git a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/InferAvroSchema.java b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/InferAvroSchema.java index 4344ce099e04..69545dd4f38a 100644 --- a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/InferAvroSchema.java +++ b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/InferAvroSchema.java @@ -20,7 +20,7 @@ import org.apache.avro.Schema; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.nifi.annotation.behavior.InputRequirement; import org.apache.nifi.annotation.behavior.ReadsAttribute; import org.apache.nifi.annotation.behavior.ReadsAttributes; 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 e6f7c3a43804..1782a9251d44 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 @@ -82,15 +82,10 @@ spring-context ${spring.version} - - org.springframework - spring-tx - ${spring.version} - - org.apache.commons - commons-lang3 - 3.7 + org.springframework + spring-tx + ${spring.version} org.apache.directory.server 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 8fd828edfe53..7166397bf0e5 100644 --- a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml +++ b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml @@ -49,7 +49,7 @@ org.apache.tika tika-parsers - 1.17 + 1.19 com.fasterxml.jackson.core @@ -66,12 +66,6 @@ - - - org.apache.commons - commons-compress - 1.16.1 - diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/pom.xml index 9bfe27f40a23..f4dfa8f679a8 100644 --- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/pom.xml +++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/pom.xml @@ -55,7 +55,7 @@ com.fasterxml.jackson.core jackson-databind - 2.9.5 + 2.9.7 org.mongodb diff --git a/nifi-nar-bundles/nifi-network-bundle/nifi-network-processors/pom.xml b/nifi-nar-bundles/nifi-network-bundle/nifi-network-processors/pom.xml index 3491cd989efe..9996ea9904ca 100644 --- a/nifi-nar-bundles/nifi-network-bundle/nifi-network-processors/pom.xml +++ b/nifi-nar-bundles/nifi-network-bundle/nifi-network-processors/pom.xml @@ -44,7 +44,7 @@ com.fasterxml.jackson.core jackson-databind - 2.9.5 + 2.9.7 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-network-bundle/nifi-network-utils/pom.xml b/nifi-nar-bundles/nifi-network-bundle/nifi-network-utils/pom.xml index 0a72a1c0d5b4..55f0277d086d 100644 --- a/nifi-nar-bundles/nifi-network-bundle/nifi-network-utils/pom.xml +++ b/nifi-nar-bundles/nifi-network-bundle/nifi-network-utils/pom.xml @@ -14,30 +14,30 @@ limitations under the License. --> - - nifi-network-bundle - org.apache.nifi - 1.8.0-SNAPSHOT - - 4.0.0 - nifi-network-utils - jar - - - com.fasterxml.jackson.core - jackson-databind - 2.9.5 - - - org.slf4j - slf4j-simple - test - - - junit - junit - test - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + nifi-network-bundle + org.apache.nifi + 1.8.0-SNAPSHOT + + 4.0.0 + nifi-network-utils + jar + + + com.fasterxml.jackson.core + jackson-databind + 2.9.7 + + + org.slf4j + slf4j-simple + test + + + junit + junit + test + + \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml index 3de45c9dbfd5..ccc689207051 100644 --- a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml +++ b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml @@ -17,7 +17,7 @@ 4.0.0 - 3.17 + 4.0.0 diff --git a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java index 7a762f4b718f..51abc27f955a 100644 --- a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java +++ b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java @@ -55,7 +55,7 @@ import org.apache.poi.ss.usermodel.DataFormatter; import org.apache.poi.ss.util.CellAddress; import org.apache.poi.ss.util.CellReference; -import org.apache.poi.util.SAXHelper; +import org.apache.poi.ooxml.util.SAXHelper; import org.apache.poi.xssf.eventusermodel.ReadOnlySharedStringsTable; import org.apache.poi.xssf.eventusermodel.XSSFReader; import org.apache.poi.xssf.eventusermodel.XSSFSheetXMLHandler; diff --git a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/groovy/org/apache/nifi/provenance/EncryptedWriteAheadProvenanceRepositoryTest.groovy b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/groovy/org/apache/nifi/provenance/EncryptedWriteAheadProvenanceRepositoryTest.groovy index 582a80518862..ce1ebc7d8938 100644 --- a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/groovy/org/apache/nifi/provenance/EncryptedWriteAheadProvenanceRepositoryTest.groovy +++ b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/groovy/org/apache/nifi/provenance/EncryptedWriteAheadProvenanceRepositoryTest.groovy @@ -29,6 +29,7 @@ import org.junit.Before import org.junit.BeforeClass import org.junit.ClassRule import org.junit.Test +import org.junit.Ignore import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith import org.junit.runners.JUnit4 @@ -249,6 +250,7 @@ class EncryptedWriteAheadProvenanceRepositoryTest { } @Test + @Ignore("test is unstable. NIFI-5624 to improve it") void testShouldRegisterAndGetEvent() { // Arrange diff --git a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/ITestPersistentProvenanceRepository.java similarity index 99% rename from nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java rename to nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/ITestPersistentProvenanceRepository.java index f031710e58f5..db87c97384d7 100644 --- a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java +++ b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/ITestPersistentProvenanceRepository.java @@ -102,7 +102,7 @@ import static org.junit.Assume.assumeFalse; import static org.mockito.Mockito.mock; -public class TestPersistentProvenanceRepository { +public class ITestPersistentProvenanceRepository { @Rule public TestName name = new TestName(); diff --git a/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml b/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml index 39e41ffb3382..517622b00aeb 100644 --- a/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml @@ -59,12 +59,12 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 org.bouncycastle bcprov-jdk15on - 1.59 + 1.60 diff --git a/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/pom.xml b/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/pom.xml index 045dc4d8a007..d7e8b07d13b6 100644 --- a/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/pom.xml +++ b/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/pom.xml @@ -54,7 +54,7 @@ com.fasterxml.jackson.core jackson-databind - 2.9.5 + 2.9.7 org.apache.nifi 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 7138820fe0f8..57515ce0b77d 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.7 + 3.8.1 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 330b78e0549f..e451fa06e841 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.7 + 3.8.1 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 3502816c4ffe..b3a72f726263 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.7 + 3.8.1 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-riemann-bundle/pom.xml b/nifi-nar-bundles/nifi-riemann-bundle/pom.xml index 986325a100d1..8f0f8b22a137 100644 --- a/nifi-nar-bundles/nifi-riemann-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-riemann-bundle/pom.xml @@ -37,7 +37,7 @@ com.aphyr riemann-java-client - 0.4.0 + 0.4.1 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 925b2e20d425..f4bcdfae89b9 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 @@ -79,7 +79,7 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 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 18befabe9737..2d0fee7a67de 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 @@ -53,12 +53,12 @@ com.fasterxml.jackson.core jackson-core - 2.9.5 + 2.9.7 commons-codec commons-codec - 1.10 + 1.11 org.apache.nifi 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 42d9bee17d22..04b98ca7077f 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 @@ -101,7 +101,7 @@ org.apache.commons commons-text - 1.3 + 1.4 \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-splunk-bundle/pom.xml b/nifi-nar-bundles/nifi-splunk-bundle/pom.xml index 0f422d726e45..a792d5b65fc4 100644 --- a/nifi-nar-bundles/nifi-splunk-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-splunk-bundle/pom.xml @@ -51,7 +51,7 @@ com.splunk splunk - 1.6.3.0 + 1.6.4.0 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 9b6fb6df917e..95902b2fc53f 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 @@ -28,7 +28,7 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 commons-io diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java index bc031fef087b..889c5672a372 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java @@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.nifi.annotation.behavior.EventDriven; import org.apache.nifi.annotation.behavior.SystemResourceConsideration; import org.apache.nifi.annotation.behavior.InputRequirement; diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml index 0a0952b3b8bf..e06a76687839 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml @@ -33,9 +33,9 @@ nifi-standard-web-test-utils - 2.9.5 + 2.9.7 2.2.0 - 0.1.0 + 0.1.1 2.26 @@ -170,27 +170,27 @@ org.apache.commons commons-compress - 1.16.1 + 1.18 org.apache.commons commons-lang3 - 3.7 + 3.8.1 org.bouncycastle bcprov-jdk15on - 1.59 + 1.60 org.bouncycastle bcpg-jdk15on - 1.59 + 1.60 org.bouncycastle bcpkix-jdk15on - 1.59 + 1.60 commons-codec @@ -230,7 +230,7 @@ org.tukaani xz - 1.6 + 1.8 net.sf.saxon @@ -250,12 +250,12 @@ org.apache.activemq activemq-client - 5.15.3 + 5.15.6 org.apache.activemq activemq-broker - 5.15.3 + 5.15.6 test @@ -271,7 +271,7 @@ org.apache.tika tika-core - 1.17 + 1.19 com.squareup.okhttp3 @@ -281,7 +281,7 @@ com.burgstaller okhttp-digest - 1.13 + 1.18 jar @@ -297,7 +297,7 @@ org.xerial.snappy snappy-java - 1.1.2 + 1.1.7.2 com.h2database @@ -330,7 +330,7 @@ com.github.wnameless json-flattener - 0.5.0 + 0.6.0 org.apache.bval @@ -373,7 +373,7 @@ org.apache.calcite calcite-core - 1.12.0 + 1.17.0 org.apache.avro 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 41f29fc038d0..1423ea3cea15 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.4 + 3.8.1 org.slf4j diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml index e923cf1c03f1..aa521ca358a3 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml @@ -28,8 +28,8 @@ limitations under the License. nifi-hwx-schema-registry-service jar - 0.5.1 - 2.9.5 + 0.5.3 + 2.9.7 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 7fd63361a4a8..26a88395f614 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,12 +53,12 @@ org.apache.commons commons-configuration2 - 2.1.1 + 2.3 org.apache.commons commons-csv - 1.4 + 1.5 commons-beanutils @@ -143,7 +143,7 @@ com.burgstaller okhttp-digest - 1.13 + 1.18 compile 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 30694b50d9c9..260fabb4f2a0 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 @@ -59,17 +59,12 @@ com.fasterxml.jackson.core jackson-databind - 2.9.5 - - - org.apache.commons - commons-lang3 - 3.7 + 2.9.7 org.apache.commons commons-csv - 1.4 + 1.5 com.fasterxml.jackson.dataformat @@ -114,6 +109,11 @@ 2.2.1 test + + org.apache.commons + commons-text + 1.4 + diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/csv/TestCSVRecordReader.java b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/csv/TestCSVRecordReader.java index a4415b7292ce..5095767afbde 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/csv/TestCSVRecordReader.java +++ b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/csv/TestCSVRecordReader.java @@ -18,7 +18,7 @@ package org.apache.nifi.csv; import org.apache.commons.csv.CSVFormat; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.nifi.logging.ComponentLog; import org.apache.nifi.serialization.MalformedRecordException; import org.apache.nifi.serialization.SimpleRecordSchema; diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/csv/TestJacksonCSVRecordReader.java b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/csv/TestJacksonCSVRecordReader.java index 66486eef1a16..d83cbfbb22a1 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/csv/TestJacksonCSVRecordReader.java +++ b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/csv/TestJacksonCSVRecordReader.java @@ -18,7 +18,7 @@ package org.apache.nifi.csv; import org.apache.commons.csv.CSVFormat; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.nifi.logging.ComponentLog; import org.apache.nifi.serialization.MalformedRecordException; import org.apache.nifi.serialization.SimpleRecordSchema; 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 70e8833e078b..4ce65663d4a4 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,7 +35,7 @@ org.apache.commons commons-lang3 - 3.7 + 3.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 bcad29d55843..309bf3a31846 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 @@ -25,7 +25,7 @@ true true - 2.9.5 + 2.9.7 2.26 @@ -137,7 +137,7 @@ org.apache.commons commons-lang3 - 3.7 + 3.8.1 diff --git a/nifi-toolkit/nifi-toolkit-admin/pom.xml b/nifi-toolkit/nifi-toolkit-admin/pom.xml index a6f46851018f..e7c9ca27dc74 100644 --- a/nifi-toolkit/nifi-toolkit-admin/pom.xml +++ b/nifi-toolkit/nifi-toolkit-admin/pom.xml @@ -24,7 +24,7 @@ language governing permissions and limitations under the License. --> commons-cli commons-cli - 1.3.1 + 1.4 com.google.guava @@ -39,7 +39,7 @@ language governing permissions and limitations under the License. --> com.fasterxml.jackson.core jackson-databind - 2.9.5 + 2.9.7 org.apache.nifi @@ -118,7 +118,7 @@ language governing permissions and limitations under the License. --> org.apache.commons commons-compress - 1.16.1 + 1.18 diff --git a/nifi-toolkit/nifi-toolkit-cli/pom.xml b/nifi-toolkit/nifi-toolkit-cli/pom.xml index 5728eebade86..8fb718ae532c 100644 --- a/nifi-toolkit/nifi-toolkit-cli/pom.xml +++ b/nifi-toolkit/nifi-toolkit-cli/pom.xml @@ -48,7 +48,7 @@ commons-cli commons-cli - 1.3.1 + 1.4 org.apache.nifi @@ -69,7 +69,7 @@ com.fasterxml.jackson.core jackson-databind - 2.9.5 + 2.9.7 org.jline diff --git a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml index 764fcbff125b..a2925182a5b1 100644 --- a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml +++ b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml @@ -54,7 +54,7 @@ commons-cli commons-cli - 1.3.1 + 1.4 com.github.stefanbirkner @@ -77,7 +77,7 @@ org.apache.commons commons-configuration2 - 2.0 + 2.3 commons-beanutils diff --git a/nifi-toolkit/nifi-toolkit-s2s/pom.xml b/nifi-toolkit/nifi-toolkit-s2s/pom.xml index b38baae52358..3a9c4ae0729f 100644 --- a/nifi-toolkit/nifi-toolkit-s2s/pom.xml +++ b/nifi-toolkit/nifi-toolkit-s2s/pom.xml @@ -24,7 +24,7 @@ Site-to-site cli - 2.9.5 + 2.9.7 @@ -36,7 +36,7 @@ commons-cli commons-cli - 1.3.1 + 1.4 commons-io diff --git a/nifi-toolkit/nifi-toolkit-tls/pom.xml b/nifi-toolkit/nifi-toolkit-tls/pom.xml index f2b813f373c9..445e46c10ffc 100644 --- a/nifi-toolkit/nifi-toolkit-tls/pom.xml +++ b/nifi-toolkit/nifi-toolkit-tls/pom.xml @@ -24,7 +24,7 @@ Tooling to make tls configuration easier 2.26 - 2.9.5 + 2.9.7 @@ -52,17 +52,17 @@ org.bouncycastle bcpkix-jdk15on - 1.59 + 1.60 org.bouncycastle bcprov-jdk15on - 1.59 + 1.60 commons-cli commons-cli - 1.3.1 + 1.4 commons-io diff --git a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml index 5d8b97f74b86..ce61401ca802 100644 --- a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml +++ b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml @@ -28,7 +28,7 @@ commons-cli commons-cli - 1.3.1 + 1.4 com.google.guava diff --git a/pom.xml b/pom.xml index 80662ee60ece..7d433b4247e7 100644 --- a/pom.xml +++ b/pom.xml @@ -433,7 +433,7 @@ com.puppycrawl.tools checkstyle - 8.5 + 8.12