[nifi] branch main updated (7a47c8cfbd -> 0458b6432d)
This is an automated email from the ASF dual-hosted git repository. thenatog pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 7a47c8cfbd NIFI-10162 Reorganized InvokeHTTP Properties add 0458b6432d NIFI-10158 Corrected ListFTP expression support for Hostname and Port No new revisions were added by this update. Summary of changes: .../standard/ftp/StandardFTPClientProvider.java| 13 +++-- .../apache/nifi/processors/standard/TestFTP.java | 55 -- 2 files changed, 50 insertions(+), 18 deletions(-)
[nifi] branch main updated: NIFI-10162 Reorganized InvokeHTTP Properties
This is an automated email from the ASF dual-hosted git repository.
kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 7a47c8cfbd NIFI-10162 Reorganized InvokeHTTP Properties
7a47c8cfbd is described below
commit 7a47c8cfbd458ab037275762c385d50372c130a3
Author: exceptionfactory
AuthorDate: Mon Jun 27 17:00:59 2022 -0500
NIFI-10162 Reorganized InvokeHTTP Properties
- Corrected handling of documentation for allowable values
NIFI-10162 Updated Multipart Form-Data Name description
This closes #6163.
Signed-off-by: Kevin Doran
---
.../html/HtmlDocumentationWriter.java | 15 +-
.../nifi/processors/standard/InvokeHTTP.java | 920 ++---
.../nifi/processors/standard/http/HttpHeader.java | 44 +
.../nifi/processors/standard/http/HttpMethod.java | 46 ++
.../nifi/processors/standard/InvokeHTTPTest.java | 380 -
5 files changed, 713 insertions(+), 692 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
index c086cc2f63..4659fe07a0 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
@@ -608,7 +608,7 @@ public class HtmlDocumentationWriter implements
DocumentationWriter {
for (final PropertyDependency dependency : dependencies) {
final Set dependentValues =
dependency.getDependentValues();
-final String prefix = (capitalizeThe ? "The" : "the")
+ " <" + dependency.getPropertyDisplayName() + "> Property ";
+final String prefix = (capitalizeThe ? "The" : "the")
+ " [" + dependency.getPropertyDisplayName() + "] Property ";
String suffix = "";
if (dependentValues == null) {
suffix = "has a value specified.";
@@ -638,10 +638,15 @@ public class HtmlDocumentationWriter implements
DocumentationWriter {
final StringBuilder sb = new StringBuilder("is
set to one of the following values: ");
for (final String dependentValue :
dependentValues) {
-for (AllowableValue av :
dependencyProperty.getAllowableValues()) {
-if
(dependentValue.equals(av.getValue())) {
-
sb.append("\"").append(av.getDisplayName()).append("\", ");
-break;
+final List allowableValues
= dependencyProperty.getAllowableValues();
+if (allowableValues == null) {
+
sb.append("[").append(dependentValue).append("], ");
+} else {
+for (AllowableValue av :
allowableValues) {
+if
(dependentValue.equals(av.getValue())) {
+
sb.append("[").append(av.getDisplayName()).append("], ");
+break;
+}
}
}
}
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
index 49fffdc48e..4f25e44aec 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
@@ -44,6 +44,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
@@ -93,6 +94,7 @@ import org.apache.nifi.components.AllowableValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import
[nifi] 02/02: NIFI-10180 This closes #6168. Removed standard Maven repository definitions
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 6997f17bff9270da4877fad3a53a8f4a9feae9ad Author: exceptionfactory AuthorDate: Wed Jun 29 09:32:44 2022 -0500 NIFI-10180 This closes #6168. Removed standard Maven repository definitions - Upgraded Apache parent from 25 to 26 - Upgraded Apache Rat Plugin from 0.13 to 0.14 - Upgraded Maven Compiler Plugin from 3.9.0 to 3.10.1 - Removed Confluent repository from Confluent Registry Service module - Removed MapR repository profile configuration - Removed Hortonworks repository profile configuration Signed-off-by: Joe Witt --- .../nifi-confluent-schema-registry-service/pom.xml | 7 - pom.xml| 145 + 2 files changed, 7 insertions(+), 145 deletions(-) diff --git a/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/pom.xml b/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/pom.xml index 5453d3ed93..76ae35ee29 100644 --- a/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/pom.xml +++ b/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/pom.xml @@ -63,11 +63,4 @@ test - - - -confluent -https://packages.confluent.io/maven/ - - diff --git a/pom.xml b/pom.xml index 2c89b6c39b..a80f86f912 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.apache apache -25 +26 org.apache.nifi @@ -138,75 +138,6 @@ 2.1.210 3.8.0 - - - -central - -Maven Repository -https://repo1.maven.org/maven2 - -true - - -false - - - -apache-repo -Apache Repository - https://repository.apache.org/content/repositories/releases - -true - - -false - - - -Shibboleth -Shibboleth - https://build.shibboleth.net/nexus/content/repositories/releases/ - -false - - -true - - - - - - -gcs-maven-central-mirror - -GCS Maven Central mirror - https://maven-central.storage-download.googleapis.com/repos/central/data/ - -true - - -false - - - -central -Central Repository -https://repo.maven.apache.org/maven2 -default - -false - - -never - - - - - - -hortonworks - - -hortonworks-releases -Hortonworks Repository - https://repo.hortonworks.com/content/repositories/releases/ - -true -always -warn - - -false -never -fail - - - -hortonworks-jetty -Hortonworks Jetty Repository - https://repo.hortonworks.com/content/repositories/jetty-hadoop/ - -true -always -warn - - -false -never -fail - - - - - - - - - -mapr - - -mapr-releases -MapR Repository -https://repository.mapr.com/maven/ - -false - - -true - - - - - - - @@ -1240,10 +1113,6 @@ - - -
[nifi] 01/02: NIFI-10173 This closes #6164. Upgraded Flume from 1.6.0 to 1.10.0
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit ee3dcc78bf58ff02af9351ac9593978b0b5cd0e4
Author: exceptionfactory
AuthorDate: Tue Jun 28 14:29:13 2022 -0500
NIFI-10173 This closes #6164. Upgraded Flume from 1.6.0 to 1.10.0
- Removed unmaintained flume-dataset-sink and flume-ng-elasticsearch-sink
dependencies
- Added dependency-check suppression configuration for false positives on
Flume libraries
Signed-off-by: Joe Witt
---
nifi-dependency-check-maven/suppressions.xml | 30 ++
.../nifi-flume-processors/pom.xml | 22 +---
.../src/test/resources/log4j.properties| 22
3 files changed, 31 insertions(+), 43 deletions(-)
diff --git a/nifi-dependency-check-maven/suppressions.xml
b/nifi-dependency-check-maven/suppressions.xml
index a1f15c36d2..db3e58a794 100644
--- a/nifi-dependency-check-maven/suppressions.xml
+++ b/nifi-dependency-check-maven/suppressions.xml
@@ -99,4 +99,34 @@
^pkg:maven/org\.apache\.spark/spark\-.+?_2\.13@.*$
cpe:/a:apache:spark
+
+Apache Hive vulnerabilities do not apply to Flume Hive
Sink
+^pkg:maven/org\.apache\.flume\.flume\-ng\-sinks/flume\-hive\-sink@.*$
+cpe:/a:apache:hive
+
+
+Apache Kafka vulnerabilities do not apply to Flume Kafka
Sink
+^pkg:maven/org\.apache\.flume\.flume\-ng\-sinks/flume\-ng\-kafka\-sink@.*$
+cpe:/a:apache:kafka
+
+
+Apache Kafka vulnerabilities do not apply to Flume Kafka
Source
+^pkg:maven/org\.apache\.flume\.flume\-ng\-sources/flume\-kafka\-source@.*$
+cpe:/a:apache:kafka
+
+
+Apache Kafka vulnerabilities do not apply to Flume Shared
Kafka
+^pkg:maven/org\.apache\.flume\.flume\-shared/flume\-shared\-kafka@.*$
+cpe:/a:apache:kafka
+
+
+Apache HBase vulnerabilities do not apply to Flume HBase
Sink
+^pkg:maven/org\.apache\.flume\.flume\-ng\-sinks/flume\-ng\-hbase\-sink@.*$
+cpe:/a:apache:hbase
+
+
+Apache Solr vulnerabilities do not apply to Flume Solr
Sink
+^pkg:maven/org\.apache\.flume\.flume\-ng\-sinks/flume\-ng\-morphline\-solr\-sink@.*$
+cpe:/a:apache:solr
+
diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
index e5d32f3d80..36c7141970 100644
--- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
@@ -24,7 +24,7 @@
jar
-1.6.0
+1.10.0
@@ -96,21 +96,6 @@
-
-org.apache.flume.flume-ng-sinks
-flume-dataset-sink
-${flume.version}
-
-
-com.fasterxml.jackson.core
-jackson-databind
-
-
-commons-logging
-commons-logging
-
-
-
com.fasterxml.jackson.core
jackson-databind
@@ -173,11 +158,6 @@
flume-irc-sink
${flume.version}
-
-org.apache.flume.flume-ng-sinks
-flume-ng-elasticsearch-sink
-${flume.version}
-
org.apache.flume.flume-ng-sinks
flume-ng-hbase-sink
diff --git
a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/test/resources/log4j.properties
b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/test/resources/log4j.properties
deleted file mode 100644
index cc58727fa0..00
---
a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-log4j.rootLogger=INFO, CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
[nifi] branch main updated (39c366eeef -> 6997f17bff)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 39c366eeef NIFI-10169: When using the Insert Record Fields join strategy of JoinEnrichment, ensure that in order to combine schemas from the original record and the enrichment record we use incorporateSchema() so that even when the first enrichment record is null, we get the schema correct new ee3dcc78bf NIFI-10173 This closes #6164. Upgraded Flume from 1.6.0 to 1.10.0 new 6997f17bff NIFI-10180 This closes #6168. Removed standard Maven repository definitions The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: nifi-dependency-check-maven/suppressions.xml | 30 + .../nifi-confluent-schema-registry-service/pom.xml | 7 - .../nifi-flume-processors/pom.xml | 22 +--- .../src/test/resources/log4j.properties| 22 pom.xml| 145 + 5 files changed, 38 insertions(+), 188 deletions(-) delete mode 100644 nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/test/resources/log4j.properties
[nifi] branch main updated: NIFI-10169: When using the Insert Record Fields join strategy of JoinEnrichment, ensure that in order to combine schemas from the original record and the enrichment record
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 39c366eeef NIFI-10169: When using the Insert Record Fields join
strategy of JoinEnrichment, ensure that in order to combine schemas from the
original record and the enrichment record we use incorporateSchema() so that
even when the first enrichment record is null, we get the schema correct
39c366eeef is described below
commit 39c366eeef6a8c5be496ccab9c395a4fe94be9c3
Author: Mark Payne
AuthorDate: Sat Jun 25 11:52:38 2022 -0400
NIFI-10169: When using the Insert Record Fields join strategy of
JoinEnrichment, ensure that in order to combine schemas from the original
record and the enrichment record we use incorporateSchema() so that even when
the first enrichment record is null, we get the schema correct
Signed-off-by: Pierre Villard
This closes #6157.
---
.../nifi-standard-processors/pom.xml | 1 +
.../enrichment/InsertRecordFieldsJoinStrategy.java | 23 ++-
.../processors/standard/TestJoinEnrichment.java| 45 +-
.../insert-enrichment-first-value-null.json| 10 +
4 files changed, 76 insertions(+), 3 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index 07acc867d0..7d5c95c037 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -668,6 +668,7 @@
src/test/resources/TestValidateRecord/int-maps-data.json
src/test/resources/TestValidateRecord/array-and-map-with-null-element.avro
src/test/resources/TestJoinEnrichment/insert-enrichment.json
+
src/test/resources/TestJoinEnrichment/insert-enrichment-first-value-null.json
src/test/resources/TestJoinEnrichment/insert-original.json
src/test/resources/TestJoinEnrichment/left-outer-join-enrichment.csv
src/test/resources/TestJoinEnrichment/left-outer-join-expected.csv
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/enrichment/InsertRecordFieldsJoinStrategy.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/enrichment/InsertRecordFieldsJoinStrategy.java
index 7f09bf928e..8051c492af 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/enrichment/InsertRecordFieldsJoinStrategy.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/enrichment/InsertRecordFieldsJoinStrategy.java
@@ -39,6 +39,21 @@ public class InsertRecordFieldsJoinStrategy extends
IndexCorrelatedJoinStrategy
@Override
protected Record combineRecords(final Record originalRecord, final Record
enrichmentRecord, final RecordSchema resultSchema) {
+// We only need to incorporate the enrichment record's schema when
determining the result schema. After that,
+// we will use the result schema for writing, not the Record's schema.
So we can ignore the expense of incorporating
+// the fields.
+return combineRecords(originalRecord, enrichmentRecord, false);
+}
+
+/**
+ * Creates a single record that combines both the original record and the
enrichment record
+ * @param originalRecord the original record
+ * @param enrichmentRecord the enrichment record
+ * @param incorporateEnrichmentSchema whether or not to update the
originalRecord's schema to include the fields of the enrichmentRecord. Doing so
can be
+ * expensive and is not necessary if the Record's schema will not be used.
+ * @return the combined record
+ */
+private Record combineRecords(final Record originalRecord, final Record
enrichmentRecord, final boolean incorporateEnrichmentSchema) {
if (originalRecord == null) {
return null;
}
@@ -57,17 +72,21 @@ public class InsertRecordFieldsJoinStrategy extends
IndexCorrelatedJoinStrategy
}
final Record parentRecord = (Record) value;
-enrichmentRecord.toMap().forEach(parentRecord::setValue);
+if (incorporateEnrichmentSchema) {
+parentRecord.incorporateSchema(enrichmentRecord.getSchema());
+}
+enrichmentRecord.toMap().forEach(parentRecord::setValue);
parentRecord.incorporateInactiveFields();
}
return originalRecord;
}
+
@Override
[nifi] branch main updated: NIFI-10174 Upgraded Spring Framework from 5.3.20 to 5.3.21
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 4a9c3435db NIFI-10174 Upgraded Spring Framework from 5.3.20 to 5.3.21 4a9c3435db is described below commit 4a9c3435dbf466e6df6e1ac62bac4b89c88a195e Author: exceptionfactory AuthorDate: Tue Jun 28 15:19:39 2022 -0500 NIFI-10174 Upgraded Spring Framework from 5.3.20 to 5.3.21 - Upgraded Spring Security from 5.7.1 to 5.7.2 - Upgraded Spring Boot from 2.7.0 to 2.7.1 for NiFi Registry Signed-off-by: Pierre Villard This closes #6165. --- nifi-registry/pom.xml | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index c2cb571aac..44b53864bc 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -36,7 +36,7 @@ 2.1 -2.7.0 +2.7.1 8.4.2 7.0.0 3.12.0 diff --git a/pom.xml b/pom.xml index 5f871c66d8..2c89b6c39b 100644 --- a/pom.xml +++ b/pom.xml @@ -133,8 +133,8 @@ 3.11.2 3.10.6.Final 4.1.77.Final -5.3.20 -5.7.1 +5.3.21 +5.7.2 2.1.210 3.8.0
[nifi] branch main updated: NIFI-10175 Upgraded Jetty from 9.4.46 to 9.4.48
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 5bdede1fab NIFI-10175 Upgraded Jetty from 9.4.46 to 9.4.48 5bdede1fab is described below commit 5bdede1fab7cbde997e686283e312cc8a3de8746 Author: exceptionfactory AuthorDate: Tue Jun 28 16:01:46 2022 -0500 NIFI-10175 Upgraded Jetty from 9.4.46 to 9.4.48 Signed-off-by: Pierre Villard This closes #6166. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index be96b8f2a4..5f871c66d8 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 1.70 1.7.36 2.2.0 -9.4.46.v20220331 +9.4.48.v20220622 2.13.3 1.11.0 2.3.5
[nifi] branch main updated: NIFI-10176 Upgraded OkHttp from 4.9.3 to 4.10.0
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 4cb9997ea2 NIFI-10176 Upgraded OkHttp from 4.9.3 to 4.10.0 4cb9997ea2 is described below commit 4cb9997ea299ba1b112dc58f19e73f8349551f34 Author: exceptionfactory AuthorDate: Tue Jun 28 17:08:42 2022 -0500 NIFI-10176 Upgraded OkHttp from 4.9.3 to 4.10.0 Signed-off-by: Pierre Villard This closes #6167. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a710d8b823..be96b8f2a4 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ 2014 2.9.0 1.6.20 -4.9.3 +4.10.0 3.12.0 2.11.0 4.5.13
