(nifi) 01/01: NIFI-13006 solr component marked as deprecated
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch NIFI-13006
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 63ca5c9aa6e8c08f52885dc24751aa0934843f6c
Author: Joseph Witt
AuthorDate: Fri Apr 26 11:01:46 2024 -0700
NIFI-13006 solr component marked as deprecated
---
.../src/main/java/org/apache/nifi/processors/solr/GetSolr.java | 2 ++
.../main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java | 2 ++
.../src/main/java/org/apache/nifi/processors/solr/PutSolrRecord.java| 2 ++
.../src/main/java/org/apache/nifi/processors/solr/QuerySolr.java| 2 ++
4 files changed, 8 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
index ce6e3fd993..ec556fe929 100644
---
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
+++
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
@@ -23,6 +23,7 @@ import
org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
import org.apache.nifi.annotation.behavior.Stateful;
import org.apache.nifi.annotation.configuration.DefaultSchedule;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.components.AllowableValue;
@@ -96,6 +97,7 @@ import static
org.apache.nifi.processors.solr.SolrUtils.ZK_CONNECTION_TIMEOUT;
@CapabilityDescription("Queries Solr and outputs the results as a FlowFile in
the format of XML or using a Record Writer")
@Stateful(scopes = {Scope.CLUSTER}, description = "Stores latest date of Date
Field so that the same data will not be fetched multiple times.")
@DefaultSchedule(strategy = SchedulingStrategy.TIMER_DRIVEN, period = "1 min")
+@DeprecationNotice(reason = "The SOLR processors are deprecated and will be
removed in NiFi 2.x.")
public class GetSolr extends SolrProcessor {
public static final String STATE_MANAGER_FILTER = "stateManager_filter";
diff --git
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
index 5bfc7b7a0b..a116cb6cb7 100644
---
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
+++
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
@@ -22,6 +22,7 @@ import org.apache.nifi.annotation.behavior.DynamicProperty;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.expression.ExpressionLanguageScope;
@@ -77,6 +78,7 @@ import static
org.apache.nifi.processors.solr.SolrUtils.ZK_CONNECTION_TIMEOUT;
@CapabilityDescription("Sends the contents of a FlowFile as a ContentStream to
Solr")
@DynamicProperty(name="A Solr request parameter name", value="A Solr request
parameter value",
description="These parameters will be passed to Solr on the request")
+@DeprecationNotice(reason = "The SOLR processors are deprecated and will be
removed in NiFi 2.x.")
public class PutSolrContentStream extends SolrProcessor {
public static final PropertyDescriptor CONTENT_STREAM_PATH = new
PropertyDescriptor
diff --git
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrRecord.java
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrRecord.java
index 90dccfd91a..ea2dcfe635 100644
---
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrRecord.java
+++
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrRecord.java
@@ -22,6 +22,7 @@ import org.apache.nifi.annotation.behavior.DynamicProperty;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequ
(nifi) branch NIFI-13006 created (now 63ca5c9aa6)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch NIFI-13006 in repository https://gitbox.apache.org/repos/asf/nifi.git at 63ca5c9aa6 NIFI-13006 solr component marked as deprecated This branch includes the following new commits: new 63ca5c9aa6 NIFI-13006 solr component marked as deprecated The 1 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.
(nifi) branch main updated: NIFI-12986 Remove depreciation warning from ProcessSession.commit Explain advantage of commitAsync in ProcessSession
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
The following commit(s) were added to refs/heads/main by this push:
new 49862d5342 NIFI-12986 Remove depreciation warning from
ProcessSession.commit Explain advantage of commitAsync in ProcessSession
49862d5342 is described below
commit 49862d5342f5641f49ff1c2493259dd9628d92c2
Author: Lucas <1115+endzeitbeg...@users.noreply.github.com>
AuthorDate: Mon Apr 22 20:14:09 2024 +0300
NIFI-12986 Remove depreciation warning from ProcessSession.commit
Explain advantage of commitAsync in ProcessSession
This closes #8683
Signed-off-by: Joseph Witt
---
.../src/main/java/org/apache/nifi/processor/ProcessSession.java| 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java
b/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java
index ecbb9a4019..b3a33dcb3f 100644
--- a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java
+++ b/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java
@@ -75,10 +75,11 @@ public interface ProcessSession {
* All FlowFiles operated on within this session must be accounted for by
transfer or removal or the commit will fail.
*
* As soon as the commit completes the session is again ready to be used.
+ *
+ * See {@link #commitAsync()}, {@link #commitAsync(Runnable)}, and {@link
#commitAsync(Runnable, Consumer)}.
+ * The asynchronous session commit methods are preferable to this commit
call for most cases
+ * as it defers when the actual commit happens to the framework so that it
can optimize when the commit call takes place.
*
- * @deprecated As of NiFi 1.14.0, replaced by {@link #commitAsync()},
{@link #commitAsync(Runnable)}, and {@link #commitAsync(Runnable, Consumer)}.
- * The synchronous API is less suited for execution in
different runtimes, e.g. MiNiFi or Stateless NiFi,
- * and may cause the dataflow in such runtimes to get stuck.
* @throws IllegalStateException if detected that this method is being
called from within a read or write callback
* (see {@link #read(FlowFile, InputStreamCallback)}, {@link
#write(FlowFile, StreamCallback)},
* {@link #write(FlowFile, OutputStreamCallback)}) or while a
read or write stream is open
(nifi) branch main updated: NIFI-13042 Support Python 3.12 for Python Processors This closes #8644.
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 The following commit(s) were added to refs/heads/main by this push: new 2d9943e2d3 NIFI-13042 Support Python 3.12 for Python Processors This closes #8644. 2d9943e2d3 is described below commit 2d9943e2d30561bc28969c1c3f626f4754d671ab Author: exceptionfactory AuthorDate: Fri Apr 12 17:41:15 2024 -0500 NIFI-13042 Support Python 3.12 for Python Processors This closes #8644. - Updated Controller.py main function to join non-daemon threads avoiding RuntimeError on Python 3.12 - Replaced deprecated find_module method with find_spec - Updated documentation to include support for Python 3.12 Signed-off-by: Joseph Witt --- nifi-docs/src/main/asciidoc/administration-guide.adoc| 4 ++-- nifi-docs/src/main/asciidoc/python-developer-guide.adoc | 2 +- .../src/main/python/framework/Controller.py | 9 - .../src/main/python/framework/ExtensionManager.py| 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc index fd5248948f..b2fbeb50c4 100644 --- a/nifi-docs/src/main/asciidoc/administration-guide.adoc +++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc @@ -24,7 +24,7 @@ Apache NiFi Team Apache NiFi can run on something as simple as a laptop, but it can also be clustered across many enterprise-class servers. Therefore, the amount of hardware and memory needed will depend on the size and nature of the dataflow involved. The data is stored on disk while NiFi is processing it. So NiFi needs to have sufficient disk space allocated for its various repositories, particularly the content repository, flowfile repository, and provenance repository (see the <> s [...] * Requires Java 21 -* Use of Python-based Processors (beta feature) requires Python 3.9, 3.10 or 3.11 +* Use of Python-based Processors (beta feature) requires Python 3.9, 3.10, 3.11, or 3.12 * Supported Operating Systems: ** Linux ** Unix @@ -231,7 +231,7 @@ The `name` attribute must start with `deprecation`, followed by the component cl NiFi is a Java-based application. NiFi 2.0 introduces support for a Python-based Processor API. This capability is still considered to be in "Beta" mode and should not be used in production. By default, support for Python-based Processors is disabled. In order to enable it, -Python 3.9, 3.10 or 3.11 must be installed on the NiFi node (Python 3.12 is not supported yet). +Python 3.9, 3.10, 3.11, or 3.12 must be installed on the NiFi node. The following properties may be used to configure the Python 3 installation and process management. These properties are all located under the "Python Extensions" heading in the _nifi.properties_ file: diff --git a/nifi-docs/src/main/asciidoc/python-developer-guide.adoc b/nifi-docs/src/main/asciidoc/python-developer-guide.adoc index b798fb6d0f..fc85521ecb 100644 --- a/nifi-docs/src/main/asciidoc/python-developer-guide.adoc +++ b/nifi-docs/src/main/asciidoc/python-developer-guide.adoc @@ -509,7 +509,7 @@ because we know that the ListFile Processor will produce these attributes for us [[requirements]] == Requirements -The Python API requires that Python 3.9, 3.10 or 3.11 is available on the machine hosting NiFi (Python 3.12 is not supported yet). +The Python API requires that Python 3.9, 3.10, 3.11, or 3.12 is available on the machine hosting NiFi. Each Processor may have its own list of requirements / dependencies. These are made available to the Processor by creating a separate environment for each Processor implementation (not for each instance of a Processor on the canvas). PyPI is then used to install these diff --git a/nifi-nar-bundles/nifi-py4j-bundle/nifi-python-framework/src/main/python/framework/Controller.py b/nifi-nar-bundles/nifi-py4j-bundle/nifi-python-framework/src/main/python/framework/Controller.py index b40a444d28..038911271c 100644 --- a/nifi-nar-bundles/nifi-py4j-bundle/nifi-python-framework/src/main/python/framework/Controller.py +++ b/nifi-nar-bundles/nifi-py4j-bundle/nifi-python-framework/src/main/python/framework/Controller.py @@ -127,4 +127,11 @@ if __name__ == "__main__": # Notify the Java side of the port that Python is listening on gateway.java_gateway_server.resetCallbackClient( gateway.java_gateway_server.getCallbackClient().getAddress(), -python_port) \ No newline at end of file +python_port) + +# Join main thread to non-daemon threads in order to avoid RuntimeError on Python 3.12 blocking new thread creation in Py4J +import threading +for thread in threading.enumerate(): +if thread.daemon or thread is threading.cur
(nifi) branch support/nifi-1.x updated: NIFI-12969: Fixed a typo in the #isTempDestinationNecessary method, where we were comparing existingConnection.getProcessGroup() to newDestination.getProcessGro
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 212763dd79 NIFI-12969: Fixed a typo in the #isTempDestinationNecessary
method, where we were comparing existingConnection.getProcessGroup() to
newDestination.getProcessGroup(), instead of comparing
existingConnection.getDestination().getProcessGroup() to
newDestination.getProcessGroup(). I.e., we were comparing the Destination's PG
to the Connection's PG instead of comparing Destination's PG to Destination's
PG. This resulted in using a temporary funnel when we shouldn't. And as [...]
212763dd79 is described below
commit 212763dd79b3652c9870ff6a59db28c232113c55
Author: Mark Payne
AuthorDate: Wed Apr 3 16:35:35 2024 -0400
NIFI-12969: Fixed a typo in the #isTempDestinationNecessary method, where
we were comparing existingConnection.getProcessGroup() to
newDestination.getProcessGroup(), instead of comparing
existingConnection.getDestination().getProcessGroup() to
newDestination.getProcessGroup(). I.e., we were comparing the Destination's PG
to the Connection's PG instead of comparing Destination's PG to Destination's
PG. This resulted in using a temporary funnel when we shouldn't. And as a
result it atte [...]
Signed-off-by: Joseph Witt
---
.../flow/synchronization/StandardVersionedComponentSynchronizer.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
index 0951775778..12420e3764 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
@@ -735,7 +735,7 @@ public class StandardVersionedComponentSynchronizer
implements VersionedComponen
// If the destination is an Input Port or an Output Port and the group
changed, use a temp destination
final ConnectableType connectableType =
newDestination.getConnectableType();
final boolean port = connectableType == ConnectableType.OUTPUT_PORT ||
connectableType == ConnectableType.INPUT_PORT;
-final boolean groupChanged =
!newDestination.getProcessGroup().equals(existingConnection.getProcessGroup());
+final boolean groupChanged =
!newDestination.getProcessGroup().equals(existingConnection.getDestination().getProcessGroup());
if (port && groupChanged) {
LOG.debug("Will use a temporary destination for {} because its
destination is a port whose group has changed", existingConnection);
return true;
(nifi) branch main updated: NIFI-12969: Fixed a typo in the #isTempDestinationNecessary method, where we were comparing existingConnection.getProcessGroup() to newDestination.getProcessGroup(), instea
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
The following commit(s) were added to refs/heads/main by this push:
new 3a03caa149 NIFI-12969: Fixed a typo in the #isTempDestinationNecessary
method, where we were comparing existingConnection.getProcessGroup() to
newDestination.getProcessGroup(), instead of comparing
existingConnection.getDestination().getProcessGroup() to
newDestination.getProcessGroup(). I.e., we were comparing the Destination's PG
to the Connection's PG instead of comparing Destination's PG to Destination's
PG. This resulted in using a temporary funnel when we shouldn't. And as [...]
3a03caa149 is described below
commit 3a03caa14968d0c9a2e6790373871e886b632f09
Author: Mark Payne
AuthorDate: Wed Apr 3 16:35:35 2024 -0400
NIFI-12969: Fixed a typo in the #isTempDestinationNecessary method, where
we were comparing existingConnection.getProcessGroup() to
newDestination.getProcessGroup(), instead of comparing
existingConnection.getDestination().getProcessGroup() to
newDestination.getProcessGroup(). I.e., we were comparing the Destination's PG
to the Connection's PG instead of comparing Destination's PG to Destination's
PG. This resulted in using a temporary funnel when we shouldn't. And as a
result it atte [...]
This closes #8600.
Signed-off-by: Joseph Witt
---
.../flow/synchronization/StandardVersionedComponentSynchronizer.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
index 74ffd715b3..7b128fc6bd 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
@@ -741,7 +741,7 @@ public class StandardVersionedComponentSynchronizer
implements VersionedComponen
// If the destination is an Input Port or an Output Port and the group
changed, use a temp destination
final ConnectableType connectableType =
newDestination.getConnectableType();
final boolean port = connectableType == ConnectableType.OUTPUT_PORT ||
connectableType == ConnectableType.INPUT_PORT;
-final boolean groupChanged =
!newDestination.getProcessGroup().equals(existingConnection.getProcessGroup());
+final boolean groupChanged =
!newDestination.getProcessGroup().equals(existingConnection.getDestination().getProcessGroup());
if (port && groupChanged) {
LOG.debug("Will use a temporary destination for {} because its
destination is a port whose group has changed", existingConnection);
return true;
(nifi) branch main updated: NIFI-5894 set a default last modified time when no last modified time is provided instead of NPE
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
The following commit(s) were added to refs/heads/main by this push:
new 0bd3635ff9 NIFI-5894 set a default last modified time when no last
modified time is provided instead of NPE
0bd3635ff9 is described below
commit 0bd3635ff9cd3c1c700fe551cb66aa366f1c9186
Author: Eric
AuthorDate: Wed Dec 19 14:11:38 2018 -0500
NIFI-5894 set a default last modified time when no last modified time is
provided instead of NPE
This closes #3229.
Signed-off-by: Joseph Witt
---
.../java/org/apache/nifi/processors/standard/util/FTPTransfer.java| 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
index 057f66c8a5..e9cb364df4 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
@@ -313,12 +313,14 @@ public class FTPTransfer implements FileTransfer {
perms.append(file.hasPermission(FTPFile.WORLD_ACCESS,
FTPFile.WRITE_PERMISSION) ? "w" : "-");
perms.append(file.hasPermission(FTPFile.WORLD_ACCESS,
FTPFile.EXECUTE_PERMISSION) ? "x" : "-");
+final long lastModifiedTime = (file.getTimestamp() != null) ?
file.getTimestamp().getTimeInMillis() : 0L;
+
FileInfo.Builder builder = new FileInfo.Builder()
.filename(file.getName())
.fullPathFileName(newFullForwardPath)
.directory(file.isDirectory())
.size(file.getSize())
-.lastModifiedTime(file.getTimestamp().getTimeInMillis())
+.lastModifiedTime(lastModifiedTime)
.permissions(perms.toString())
.owner(file.getUser())
.group(file.getGroup());
(nifi) branch main updated: NIFI-12943 Upgraded Hadoop from 3.3.6 to 3.4.0 This closes #8556
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 The following commit(s) were added to refs/heads/main by this push: new dd9d1c978f NIFI-12943 Upgraded Hadoop from 3.3.6 to 3.4.0 This closes #8556 dd9d1c978f is described below commit dd9d1c978f7d4854ac0d53140f72f7c96c4e1d71 Author: exceptionfactory AuthorDate: Mon Mar 25 09:06:27 2024 -0500 NIFI-12943 Upgraded Hadoop from 3.3.6 to 3.4.0 This closes #8556 Signed-off-by: Joseph Witt --- nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml | 9 + .../nifi-record-utils/nifi-hadoop-record-utils/pom.xml | 9 + nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml | 9 + .../nifi-hadoop-libraries-nar/pom.xml| 9 + nifi-nar-bundles/nifi-hive-bundle/pom.xml| 5 + nifi-nar-bundles/nifi-iceberg-bundle/pom.xml | 5 + .../nifi-parquet-bundle/nifi-parquet-processors/pom.xml | 9 + .../nifi-hadoop-dbcp-service/pom.xml | 5 + pom.xml | 2 +- 9 files changed, 61 insertions(+), 1 deletion(-) 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 cf1d9242a3..d1e4968f83 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 @@ -76,8 +76,17 @@ commons-logging commons-logging + + +org.bouncycastle +bcprov-jdk15on + + +org.bouncycastle +bcprov-jdk18on + org.apache.hadoop hadoop-auth diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml index 978495d3b3..e01ed8aa80 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml @@ -64,8 +64,17 @@ commons-logging commons-logging + + +org.bouncycastle +bcprov-jdk15on + + +org.bouncycastle +bcprov-jdk18on + org.slf4j jcl-over-slf4j diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml index 357f057dbc..420086edde 100644 --- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml @@ -67,8 +67,17 @@ commons-logging commons-logging + + +org.bouncycastle +bcprov-jdk15on + + +org.bouncycastle +bcprov-jdk18on + org.apache.hadoop hadoop-hdfs diff --git a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml index 2d2a8c1f49..a0d2c466a4 100644 --- a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml +++ b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml @@ -73,8 +73,17 @@ org.eclipse.jetty jetty-rewrite + + +org.bouncycastle +bcprov-jdk15on + + +org.bouncycastle +bcprov-jdk18on + org.slf4j log4j-over-slf4j diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/pom.xml index 48c41e0089..1c7544f072 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml @@ -245,6 +245,11 @@ org.eclipse.jetty jetty-rewrite + + +org.bouncycastle +bcprov-jdk15on + diff --git a/nifi-nar-bundles/nifi
(nifi) branch support/nifi-1.x updated: NIFI-12911 Upgraded Jagged from 0.3.0 to 0.3.2
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 06e452742b NIFI-12911 Upgraded Jagged from 0.3.0 to 0.3.2 06e452742b is described below commit 06e452742b82364def9be816efde7cc026bf7f41 Author: exceptionfactory AuthorDate: Fri Mar 15 16:01:47 2024 -0500 NIFI-12911 Upgraded Jagged from 0.3.0 to 0.3.2 --- nifi-nar-bundles/nifi-cipher-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-cipher-bundle/pom.xml b/nifi-nar-bundles/nifi-cipher-bundle/pom.xml index 6fb6d30f62..e918ee4594 100644 --- a/nifi-nar-bundles/nifi-cipher-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-cipher-bundle/pom.xml @@ -36,7 +36,7 @@ com.exceptionfactory.jagged jagged-bom -0.3.0 +0.3.2 import pom
(nifi) branch main updated: NIFI-12911 Upgraded Jagged from 0.3.0 to 0.3.2 This closes #8522.
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 The following commit(s) were added to refs/heads/main by this push: new d62c8054d0 NIFI-12911 Upgraded Jagged from 0.3.0 to 0.3.2 This closes #8522. d62c8054d0 is described below commit d62c8054d016bbbd96b949e804fa471c6b24d274 Author: exceptionfactory AuthorDate: Fri Mar 15 16:01:47 2024 -0500 NIFI-12911 Upgraded Jagged from 0.3.0 to 0.3.2 This closes #8522. Signed-off-by: Joseph Witt --- nifi-nar-bundles/nifi-cipher-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-cipher-bundle/pom.xml b/nifi-nar-bundles/nifi-cipher-bundle/pom.xml index b3e6233c0f..049d23b0de 100644 --- a/nifi-nar-bundles/nifi-cipher-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-cipher-bundle/pom.xml @@ -36,7 +36,7 @@ com.exceptionfactory.jagged jagged-bom -0.3.0 +0.3.2 import pom
(nifi) branch main updated: NIFI-12910 Upgraded Spring Framework from 6.0.17 to 6.0.18 This closes #8520.
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 The following commit(s) were added to refs/heads/main by this push: new 82ea7a284c NIFI-12910 Upgraded Spring Framework from 6.0.17 to 6.0.18 This closes #8520. 82ea7a284c is described below commit 82ea7a284c164ab1de4fecdc41209018a3c208c7 Author: exceptionfactory AuthorDate: Fri Mar 15 15:54:11 2024 -0500 NIFI-12910 Upgraded Spring Framework from 6.0.17 to 6.0.18 This closes #8520. - Upgraded Spring Boot from 3.2.2 to 3.2.3 for Registry - Upgraded Spring Framework from 6.1.4 to 6.1.5 for Registry Signed-off-by: Joseph Witt --- nifi-registry/pom.xml | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index 6dea181c9b..5bdeeb5d3a 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -35,8 +35,8 @@ nifi-registry-docker-maven -6.1.4 -3.2.2 +6.1.5 +3.2.3 9.22.3 9.5.0 3.12.0 diff --git a/pom.xml b/pom.xml index df42bb2751..67f63cf42e 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 2.2 4.1.106.Final 6.0.0 -6.0.17 +6.0.18 6.2.2 2.2.20 2.2.224
(nifi) branch main updated: NIFI-12772 Expose REMOTE_POLL_BATCH_SIZE property for ListSFTP
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
The following commit(s) were added to refs/heads/main by this push:
new 89b618cc05 NIFI-12772 Expose REMOTE_POLL_BATCH_SIZE property for
ListSFTP
89b618cc05 is described below
commit 89b618cc052a19bb4bcdbe8f7067ad996aad614d
Author: Tom Brisland
AuthorDate: Fri Feb 9 23:13:35 2024 +
NIFI-12772 Expose REMOTE_POLL_BATCH_SIZE property for ListSFTP
This closes #8390.
revert max results optimisation + unnecessary import
Signed-off-by: Joseph Witt
---
.../util/file/transfer/ListFileTransfer.java | 9 +-
.../apache/nifi/processors/standard/ListSFTP.java | 3 +-
.../nifi/processors/standard/TestListSFTP.java | 37 +++---
3 files changed, 29 insertions(+), 20 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-extension-utils/nifi-file-transfer/src/main/java/org/apache/nifi/processor/util/file/transfer/ListFileTransfer.java
b/nifi-nar-bundles/nifi-extension-utils/nifi-file-transfer/src/main/java/org/apache/nifi/processor/util/file/transfer/ListFileTransfer.java
index 1106b27fa3..af10d592d9 100644
---
a/nifi-nar-bundles/nifi-extension-utils/nifi-file-transfer/src/main/java/org/apache/nifi/processor/util/file/transfer/ListFileTransfer.java
+++
b/nifi-nar-bundles/nifi-extension-utils/nifi-file-transfer/src/main/java/org/apache/nifi/processor/util/file/transfer/ListFileTransfer.java
@@ -31,7 +31,6 @@ import java.time.Instant;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -124,13 +123,7 @@ public abstract class ListFileTransfer extends
AbstractListProcessor {
return listing;
}
-final Iterator itr = listing.iterator();
-while (itr.hasNext()) {
-final FileInfo next = itr.next();
-if (next.getLastModifiedTime() < minTimestamp) {
-itr.remove();
-}
-}
+listing.removeIf(file -> file.getLastModifiedTime() < minTimestamp);
return listing;
}
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java
index 16a4e8e14e..1d3e498a0c 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java
@@ -100,6 +100,7 @@ public class ListSFTP extends ListFileTransfer {
properties.add(SFTPTransfer.FILE_FILTER_REGEX);
properties.add(SFTPTransfer.PATH_FILTER_REGEX);
properties.add(SFTPTransfer.IGNORE_DOTTED_FILES);
+properties.add(SFTPTransfer.REMOTE_POLL_BATCH_SIZE);
properties.add(SFTPTransfer.STRICT_HOST_KEY_CHECKING);
properties.add(SFTPTransfer.HOST_KEY_FILE);
properties.add(SFTPTransfer.CONNECTION_TIMEOUT);
@@ -176,7 +177,7 @@ public class ListSFTP extends ListFileTransfer {
final Long maxAge =
context.getProperty(ListFile.MAX_AGE).asTimePeriod(TimeUnit.MILLISECONDS);
return (attributes) -> {
-if(attributes.isDirectory()) {
+if (attributes.isDirectory()) {
return true;
}
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java
index f2340238c1..2ae2b78335 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java
@@ -16,16 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import java.io.File;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
-
import org.apache.nifi.components.ConfigVerificationResult;
import org.apache.nifi.components.ConfigVerificationResult.Outcome;
import org.apache.nifi.distributed.cache.client.DistributedMapCacheClient;
@@ -45,6 +35,16 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import java.io.F
(nifi) branch main updated: NIFI-12796 - PutDatabaseRecord statement type should support u/c/d for Debezium This closes #8412.
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
The following commit(s) were added to refs/heads/main by this push:
new abc08eb842 NIFI-12796 - PutDatabaseRecord statement type should
support u/c/d for Debezium This closes #8412.
abc08eb842 is described below
commit abc08eb842afe7a033a20fbeb94a08be264b0512
Author: Pierre Villard
AuthorDate: Wed Feb 14 23:06:02 2024 -0500
NIFI-12796 - PutDatabaseRecord statement type should support u/c/d for
Debezium
This closes #8412.
Signed-off-by: Joseph Witt
---
.../org/apache/nifi/processors/standard/PutDatabaseRecord.java | 10 +-
.../apache/nifi/processors/standard/PutDatabaseRecordTest.java | 5 +++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
index b12d2c869f..1f60208f40 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
@@ -183,7 +183,8 @@ public class PutDatabaseRecord extends AbstractProcessor {
static final PropertyDescriptor STATEMENT_TYPE_RECORD_PATH = new Builder()
.name("Statement Type Record Path")
.displayName("Statement Type Record Path")
-.description("Specifies a RecordPath to evaluate against each Record
in order to determine the Statement Type. The RecordPath should equate to
either INSERT, UPDATE, UPSERT, or DELETE.")
+.description("Specifies a RecordPath to evaluate against each Record
in order to determine the Statement Type. The RecordPath should equate to
either INSERT, UPDATE, UPSERT, or DELETE. "
++ "(Debezium style operation types are also supported: \"r\"
and \"c\" for INSERT, \"u\" for UPDATE, and \"d\" for DELETE)")
.required(true)
.addValidator(new RecordPathValidator())
.expressionLanguageSupported(NONE)
@@ -1555,6 +1556,13 @@ public class PutDatabaseRecord extends AbstractProcessor
{
case DELETE_TYPE:
case UPSERT_TYPE:
return resultValue;
+case "C":
+case "R":
+return INSERT_TYPE;
+case "U":
+return UPDATE_TYPE;
+case "D":
+return DELETE_TYPE;
}
throw new ProcessException("Evaluated RecordPath " +
recordPath.getPath() + " against Record to determine Statement Type but found
invalid value: " + resultValue);
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordTest.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordTest.java
index 107db3f688..e6483efc7f 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordTest.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordTest.java
@@ -1311,9 +1311,10 @@ public class PutDatabaseRecordTest {
// CREATE, CREATE, CREATE, DELETE, UPDATE
parser.addRecord("INSERT", new MapRecord(dataSchema, createValues(1,
"John Doe", 55)));
parser.addRecord("INSERT", new MapRecord(dataSchema, createValues(2,
"Jane Doe", 44)));
-parser.addRecord("INSERT", new MapRecord(dataSchema, createValues(3,
"Jim Doe", 2)));
+parser.addRecord("c", new MapRecord(dataSchema, createValues(3, "Jim
Doe", 2)));
parser.addRecord("DELETE", new MapRecord(dataSchema, createValues(2,
"Jane Doe", 44)));
parser.addRecord("UPDATE", new MapRecord(dataSchema, createValues(1,
"John Doe", 201)));
+parser.addRecord("u", new MapRecord(dataSchema, createValues(3, "Jim
Doe", 20)));
runner.setProperty(PutDatabaseRecord.RECORD_READER_FACTORY, "parser");
runner.setProperty(PutDatabaseRecord.STATEMENT_TYPE,
PutDatabaseRecord.USE_RECORD_PATH);
@@ -1337,7 +1338,7 @@ public class PutDatabaseRecordTest {
assertTrue(rs.next());
assertEquals(3, rs.getInt(1));
assertEquals("Jim Doe", rs.getString(2));
-assertEquals(2, rs.getInt(3));
+assertEquals(20, rs.getInt(3));
assertFalse(rs.next());
stmt.close();
(nifi) branch support/nifi-1.x updated: NIFI-12818 Deprecated ReportLineageToAtlas for Removal This closes #8426.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new d5385c298d NIFI-12818 Deprecated ReportLineageToAtlas for Removal This
closes #8426.
d5385c298d is described below
commit d5385c298dd79110fd4c8546daa0e3e953a7cd2b
Author: exceptionfactory
AuthorDate: Mon Feb 19 14:29:02 2024 -0600
NIFI-12818 Deprecated ReportLineageToAtlas for Removal
This closes #8426.
Signed-off-by: Joseph Witt
---
.../main/java/org/apache/nifi/atlas/reporting/ReportLineageToAtlas.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/reporting/ReportLineageToAtlas.java
b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/reporting/ReportLineageToAtlas.java
index d0359fa1e0..ee3d533b45 100644
---
a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/reporting/ReportLineageToAtlas.java
+++
b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/reporting/ReportLineageToAtlas.java
@@ -30,6 +30,7 @@ import org.apache.nifi.annotation.behavior.DynamicProperty;
import org.apache.nifi.annotation.behavior.RequiresInstanceClassLoading;
import org.apache.nifi.annotation.behavior.Stateful;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.lifecycle.OnStopped;
@@ -107,6 +108,7 @@ import static org.apache.commons.lang3.StringUtils.isEmpty;
import static
org.apache.nifi.reporting.util.provenance.ProvenanceEventConsumer.PROVENANCE_BATCH_SIZE;
import static
org.apache.nifi.reporting.util.provenance.ProvenanceEventConsumer.PROVENANCE_START_POSITION;
+@DeprecationNotice(reason = "Planned for removal in NiFi 2.0")
@Tags({"atlas", "lineage"})
@CapabilityDescription("Report NiFi flow data set level lineage to Apache
Atlas." +
" End-to-end lineages across NiFi environments and other systems can
be reported if those are" +
(nifi) 01/03: NIFI-12820 Upgraded Email Processors to Jakarta Mail 2 This closes #8428.
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 ff4c187f860e332640bd1a10d09fd435d286e3f1
Author: exceptionfactory
AuthorDate: Mon Feb 19 20:18:09 2024 -0600
NIFI-12820 Upgraded Email Processors to Jakarta Mail 2
This closes #8428.
- Upgraded from Java Mail 1.4.7 to Jakarta Mail API 2.1.2
- Upgraded Spring Integration from 5.5.20 to 6.2.1
- Upgraded SubEtha SMTP from 3.1.7 to 7.0.1
- Upgraded Greenmail from 1.6.15 to 2.0.1
- Removed usage of Commons Lang3
- Removed usage of Commons IO
Signed-off-by: Joseph Witt
---
.../nifi-email-processors/pom.xml | 102 ++--
.../processors/email/AbstractEmailProcessor.java | 51 ++
.../apache/nifi/processors/email/ConsumeIMAP.java | 18 +-
.../apache/nifi/processors/email/ConsumePOP3.java | 21 +--
.../processors/email/ExtractEmailAttachments.java | 183 ++---
.../nifi/processors/email/ExtractEmailHeaders.java | 168 +--
.../processors/email/ExtractTNEFAttachments.java | 133 +--
.../apache/nifi/processors/email/ListenSMTP.java | 142 +---
.../nifi/processors/email/smtp/SmtpConsumer.java | 39 ++---
.../nifi/processors/email/GenerateAttachment.java | 131 +++
...TestConsumeEmail.java => TestConsumeEmail.java} | 36 +---
.../email/TestExtractEmailAttachments.java | 33 ++--
.../processors/email/TestExtractEmailHeaders.java | 72 ++--
.../nifi/processors/email/TestListenSMTP.java | 12 +-
pom.xml| 1 -
15 files changed, 443 insertions(+), 699 deletions(-)
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 ddb94f1b2b..c6a4930dbb 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
@@ -25,7 +25,7 @@
nifi-email-processors
jar
-5.5.20
+6.2.1
5.2.5
@@ -37,103 +37,95 @@
org.apache.nifi
nifi-utils
-2.0.0-SNAPSHOT
org.apache.nifi
-nifi-security-cert
-2.0.0-SNAPSHOT
+nifi-ssl-context-service-api
org.apache.nifi
nifi-oauth2-provider-api
-2.0.0-SNAPSHOT
-
-
-javax.mail
-mail
-1.4.7
-
-
-org.apache.commons
-commons-email
-1.6.0
-
-
-com.sun.mail
-javax.mail
-
-
-
-
-commons-io
-commons-io
-org.apache.commons
-commons-lang3
+jakarta.mail
+jakarta.mail-api
+2.1.2
-com.sun.mail
-javax.mail
-1.6.2
+org.eclipse.angus
+angus-mail
+2.0.2
-org.subethamail
+com.github.davidmoten
subethasmtp
-3.1.7
-
-
-com.google.code.findbugs
-jsr305
-
-
-javax.mail
-mail
-
-
-
-
-com.github.stephenc.findbugs
-findbugs-annotations
-1.3.9-1
-
-
-org.apache.nifi
-nifi-ssl-context-service-api
+7.0.1
org.springframework.integration
spring-integration-mail
${spring.integration.version}
+
org.springframework.retry
spring-retry
+
+org.springframework
+spring-aop
+
+
+org.springframework
+spring-tx
+
+
+org.springframework
+spring-context-support
+
+
+io.projectreactor
+reactor-core
+
+
+io.micrometer
+micrometer-observation
+
+
org.apache.poi
poi-scratchpad
${poi.version}
+
+
+org.apache.commons
+commons-ma
(nifi) 03/03: NIFI-12817 Moved Hadoop DBCP NAR to Hadoop Build Profile This closes #8425.
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 27f8b98e9a64e544e0158b36700091610389dea5 Author: exceptionfactory AuthorDate: Mon Feb 19 13:53:50 2024 -0600 NIFI-12817 Moved Hadoop DBCP NAR to Hadoop Build Profile This closes #8425. Signed-off-by: Joseph Witt --- nifi-assembly/pom.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index ec602f141b..5d521e1152 100644 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -368,12 +368,6 @@ language governing permissions and limitations under the License. --> 2.0.0-SNAPSHOT nar - -org.apache.nifi -nifi-hadoop-dbcp-service-nar -2.0.0-SNAPSHOT -nar - org.apache.nifi nifi-mongodb-client-service-api-nar @@ -1003,6 +997,12 @@ language governing permissions and limitations under the License. --> 2.0.0-SNAPSHOT nar + +org.apache.nifi +nifi-hadoop-dbcp-service-nar +2.0.0-SNAPSHOT +nar + org.apache.nifi nifi-parquet-nar
(nifi) 02/03: NIFI-12821 Set docker-maven-plugin version to 0.43.4 This closes #8429.
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 1124728ff73c8fdb2cf6683d3a1f0686ef9b093b Author: exceptionfactory AuthorDate: Mon Feb 19 20:53:04 2024 -0600 NIFI-12821 Set docker-maven-plugin version to 0.43.4 This closes #8429. - Reduced docker-tests timeout from 120 to 60 minutes Signed-off-by: Joseph Witt --- .github/workflows/docker-tests.yml | 5 + pom.xml| 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-tests.yml b/.github/workflows/docker-tests.yml index 9a2161a75b..fc36cc981b 100644 --- a/.github/workflows/docker-tests.yml +++ b/.github/workflows/docker-tests.yml @@ -16,7 +16,6 @@ name: docker-tests on: - # Run every day at 02:00 schedule: - cron: "0 2 * * *" push: @@ -59,7 +58,6 @@ env: -ntp -ff -# build assemblies (including binaries) for use in Docker Image builds MAVEN_BUILD_ARGUMENTS: >- -am -D skipTests @@ -82,7 +80,6 @@ env: -pl -nifi-toolkit/nifi-toolkit-encrypt-config -pl -minifi/minifi-assembly -# build and test Docker Images MAVEN_DOCKER_ARGUMENTS: >- verify -P docker @@ -100,7 +97,7 @@ permissions: jobs: build_and_test: -timeout-minutes: 120 +timeout-minutes: 60 runs-on: ubuntu-latest name: Ubuntu Java 21 steps: diff --git a/pom.xml b/pom.xml index bee1d2ff27..6f0372489e 100644 --- a/pom.xml +++ b/pom.xml @@ -884,6 +884,7 @@ io.fabric8 docker-maven-plugin +0.43.4 org.codehaus.mojo
(nifi) branch main updated (fcbd7c690b -> 27f8b98e9a)
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 fcbd7c690b NIFI-12644 Exported json flows does not match minifi json
schema resolved by adding new method transform-nifi to convert Nifi Flow json
to MiNifi flow json #8393
new ff4c187f86 NIFI-12820 Upgraded Email Processors to Jakarta Mail 2 This
closes #8428.
new 1124728ff7 NIFI-12821 Set docker-maven-plugin version to 0.43.4 This
closes #8429.
new 27f8b98e9a NIFI-12817 Moved Hadoop DBCP NAR to Hadoop Build Profile
This closes #8425.
The 3 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:
.github/workflows/docker-tests.yml | 5 +-
nifi-assembly/pom.xml | 12 +-
.../nifi-email-processors/pom.xml | 102 ++--
.../processors/email/AbstractEmailProcessor.java | 51 ++
.../apache/nifi/processors/email/ConsumeIMAP.java | 18 +-
.../apache/nifi/processors/email/ConsumePOP3.java | 21 +--
.../processors/email/ExtractEmailAttachments.java | 183 ++---
.../nifi/processors/email/ExtractEmailHeaders.java | 168 +--
.../processors/email/ExtractTNEFAttachments.java | 133 +--
.../apache/nifi/processors/email/ListenSMTP.java | 142 +---
.../nifi/processors/email/smtp/SmtpConsumer.java | 39 ++---
.../nifi/processors/email/GenerateAttachment.java | 131 +++
...TestConsumeEmail.java => TestConsumeEmail.java} | 36 +---
.../email/TestExtractEmailAttachments.java | 33 ++--
.../processors/email/TestExtractEmailHeaders.java | 72 ++--
.../nifi/processors/email/TestListenSMTP.java | 12 +-
pom.xml| 2 +-
17 files changed, 451 insertions(+), 709 deletions(-)
rename
nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/{ITestConsumeEmail.java
=> TestConsumeEmail.java} (82%)
(nifi) 01/02: NIFI-12792 Deprecated nifi-spark-bundle components for removal This closes #8408
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 463e965f588ec405e1e9d49d5246f81b069a70e2
Author: exceptionfactory
AuthorDate: Wed Feb 14 15:03:11 2024 -0600
NIFI-12792 Deprecated nifi-spark-bundle components for removal
This closes #8408
Signed-off-by: Joseph Witt
---
.../java/org/apache/nifi/controller/livy/LivySessionController.java | 2 ++
.../java/org/apache/nifi/processors/livy/ExecuteSparkInteractive.java | 2 ++
2 files changed, 4 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/src/main/java/org/apache/nifi/controller/livy/LivySessionController.java
b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/src/main/java/org/apache/nifi/controller/livy/LivySessionController.java
index f691346c17..904fe75183 100644
---
a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/src/main/java/org/apache/nifi/controller/livy/LivySessionController.java
+++
b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/src/main/java/org/apache/nifi/controller/livy/LivySessionController.java
@@ -36,6 +36,7 @@ import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnDisabled;
import org.apache.nifi.annotation.lifecycle.OnEnabled;
@@ -84,6 +85,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+@DeprecationNotice(reason = "Unmaintained and planned for removal in version
2.0")
@Tags({"Livy", "REST", "Spark", "http"})
@CapabilityDescription("Manages pool of Spark sessions over HTTP")
public class LivySessionController extends AbstractControllerService
implements LivySessionService {
diff --git
a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/main/java/org/apache/nifi/processors/livy/ExecuteSparkInteractive.java
b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/main/java/org/apache/nifi/processors/livy/ExecuteSparkInteractive.java
index 41eaac0152..99181eca3d 100644
---
a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/main/java/org/apache/nifi/processors/livy/ExecuteSparkInteractive.java
+++
b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/main/java/org/apache/nifi/processors/livy/ExecuteSparkInteractive.java
@@ -44,6 +44,7 @@ import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.controller.api.livy.exception.SessionManagerException;
@@ -64,6 +65,7 @@ import org.codehaus.jettison.json.JSONObject;
import org.apache.nifi.controller.api.livy.LivySessionService;
import org.apache.nifi.expression.ExpressionLanguageScope;
+@DeprecationNotice(reason = "Unmaintained and planned for removal in version
2.0")
@InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED)
@Tags({"spark", "livy", "http", "execute"})
@CapabilityDescription("Execute Spark Code over a Livy-managed HTTP session to
a live Spark context. Supports cached RDD sharing.")
(nifi) branch support/nifi-1.x updated (b262f96b56 -> f9b89b7248)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git from b262f96b56 NIFI-12777 Add support for UUID record field type in QueryRecord processor new 463e965f58 NIFI-12792 Deprecated nifi-spark-bundle components for removal This closes #8408 new f9b89b7248 NIFI-12770 Deprecated Ranger Authorizers for Removal This closes #8387 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-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml | 4 .../org/apache/nifi/ranger/authorization/RangerNiFiAuthorizer.java | 6 +- .../java/org/apache/nifi/controller/livy/LivySessionController.java | 2 ++ .../org/apache/nifi/processors/livy/ExecuteSparkInteractive.java| 2 ++ .../nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml| 5 + .../main/java/org/apache/nifi/registry/ranger/RangerAuthorizer.java | 4 6 files changed, 22 insertions(+), 1 deletion(-)
(nifi) 02/02: NIFI-12770 Deprecated Ranger Authorizers for Removal This closes #8387
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit f9b89b7248d343e07cbe49108855cdd292080ee5
Author: exceptionfactory
AuthorDate: Fri Feb 9 16:21:34 2024 -0600
NIFI-12770 Deprecated Ranger Authorizers for Removal
This closes #8387
Signed-off-by: Joseph Witt
---
nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml | 4
.../org/apache/nifi/ranger/authorization/RangerNiFiAuthorizer.java | 6 +-
.../nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml| 5 +
.../main/java/org/apache/nifi/registry/ranger/RangerAuthorizer.java | 4
4 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml
b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml
index 0c4f47ed18..6e26203268 100644
--- a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml
+++ b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml
@@ -41,6 +41,10 @@
org.slf4j
jcl-over-slf4j
+
+org.apache.nifi
+nifi-deprecation-log
+
org.apache.ranger
ranger-plugins-common
diff --git
a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/src/main/java/org/apache/nifi/ranger/authorization/RangerNiFiAuthorizer.java
b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/src/main/java/org/apache/nifi/ranger/authorization/RangerNiFiAuthorizer.java
index d7513d7d6f..a96eb83910 100644
---
a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/src/main/java/org/apache/nifi/ranger/authorization/RangerNiFiAuthorizer.java
+++
b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/src/main/java/org/apache/nifi/ranger/authorization/RangerNiFiAuthorizer.java
@@ -33,6 +33,8 @@ import
org.apache.nifi.authorization.exception.AuthorizationAccessException;
import org.apache.nifi.authorization.exception.AuthorizerCreationException;
import org.apache.nifi.authorization.exception.AuthorizerDestructionException;
import org.apache.nifi.components.PropertyValue;
+import org.apache.nifi.deprecation.log.DeprecationLogger;
+import org.apache.nifi.deprecation.log.DeprecationLoggerFactory;
import org.apache.nifi.util.NiFiProperties;
import org.apache.ranger.audit.model.AuthzAuditEvent;
import org.apache.ranger.authorization.hadoop.config.RangerConfiguration;
@@ -85,9 +87,11 @@ public class RangerNiFiAuthorizer implements Authorizer,
AuthorizationAuditor {
private volatile NiFiProperties nifiProperties;
private final NumberFormat numberFormat = NumberFormat.getInstance();
+private final DeprecationLogger deprecationLogger =
DeprecationLoggerFactory.getLogger(getClass());
+
@Override
public void initialize(AuthorizerInitializationContext
initializationContext) throws AuthorizerCreationException {
-
+deprecationLogger.warn("Apache Ranger integration does not support
Jetty 12 and related libraries required for NiFi 2.0");
}
@Override
diff --git
a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
index a328668f71..67ef61339b 100644
---
a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
+++
b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
@@ -78,6 +78,11 @@
org.slf4j
jcl-over-slf4j
+
+org.apache.nifi
+nifi-deprecation-log
+1.26.0-SNAPSHOT
+
diff --git
a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/src/main/java/org/apache/nifi/registry/ranger/RangerAuthorizer.java
b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/src/main/java/org/apache/nifi/registry/ranger/RangerAuthorizer.java
index ee90729b69..98edcb2c91 100644
---
a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/src/main/java/org/apache/nifi/registry/ranger/RangerAuthorizer.java
+++
b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/src/main/java/org/apache/nifi/registry/ranger/RangerAuthorizer.java
@@ -19,6 +19,8 @@ package org.apache.nifi.registry.ranger;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.nifi.deprecation.log.DeprecationLogger;
+import org.apache.nifi.deprecation.log.DeprecationLoggerFactory;
import org.apache.nifi.registry.properties.NiFiRegistryProperties;
import org.apache.nifi.registry.security.authorization.Ac
(nifi) branch main updated: NIFI-12793 Removed deprecated nifi-spark-bundle This closes #8409
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 The following commit(s) were added to refs/heads/main by this push: new fcaaa566e8 NIFI-12793 Removed deprecated nifi-spark-bundle This closes #8409 fcaaa566e8 is described below commit fcaaa566e89ea52250e02fb0af1446aec27cc75d Author: exceptionfactory AuthorDate: Wed Feb 14 14:59:14 2024 -0600 NIFI-12793 Removed deprecated nifi-spark-bundle This closes #8409 Signed-off-by: Joseph Witt --- nifi-code-coverage/pom.xml | 15 - .../nifi-livy-controller-service-api-nar/pom.xml | 39 -- .../src/main/resources/META-INF/LICENSE| 257 - .../src/main/resources/META-INF/NOTICE | 63 --- .../nifi-livy-controller-service-api/pom.xml | 40 -- .../controller/api/livy/LivySessionService.java| 33 -- .../livy/exception/SessionManagerException.java| 27 - .../nifi-livy-controller-service/pom.xml | 85 --- .../controller/livy/LivySessionController.java | 572 - .../org.apache.nifi.controller.ControllerService | 16 - .../nifi-spark-bundle/nifi-livy-nar/pom.xml| 48 -- .../src/main/resources/META-INF/LICENSE| 257 - .../src/main/resources/META-INF/NOTICE | 89 .../nifi-spark-bundle/nifi-livy-processors/pom.xml | 89 .../processors/livy/ExecuteSparkInteractive.java | 316 .../services/org.apache.nifi.processor.Processor | 16 - .../livy/TestExecuteSparkInteractive.java | 115 - nifi-nar-bundles/nifi-spark-bundle/pom.xml | 82 --- nifi-nar-bundles/pom.xml | 1 - 19 files changed, 2160 deletions(-) diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml index 5dad4ff268..ec929c0331 100644 --- a/nifi-code-coverage/pom.xml +++ b/nifi-code-coverage/pom.xml @@ -1469,21 +1469,6 @@ nifi-solr-processors 2.0.0-SNAPSHOT - -org.apache.nifi -nifi-livy-controller-service -2.0.0-SNAPSHOT - - -org.apache.nifi -nifi-livy-controller-service-api -2.0.0-SNAPSHOT - - -org.apache.nifi -nifi-livy-processors -2.0.0-SNAPSHOT - org.apache.nifi nifi-splunk-processors diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service-api-nar/pom.xml b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service-api-nar/pom.xml deleted file mode 100644 index ca5dbcc2e6..00 --- a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service-api-nar/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd;> -4.0.0 - -org.apache.nifi -nifi-spark-bundle -2.0.0-SNAPSHOT - - -nifi-livy-controller-service-api-nar -nar - - - -org.apache.nifi -nifi-standard-services-api-nar -2.0.0-SNAPSHOT -nar - - -org.apache.nifi -nifi-livy-controller-service-api -2.0.0-SNAPSHOT - - - \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service-api-nar/src/main/resources/META-INF/LICENSE b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service-api-nar/src/main/resources/META-INF/LICENSE deleted file mode 100644 index d86d9641f1..00 --- a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service-api-nar/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,257 +0,0 @@ - - Apache License - Version 2.0, January 2004 -http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the -
(nifi) branch support/nifi-1.x updated: NIFI-12769 Updated copyright year to 2024 in NOTICE file headers This closes #8385.
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 3baf052aae NIFI-12769 Updated copyright year to 2024 in NOTICE file headers This closes #8385. 3baf052aae is described below commit 3baf052aae18c97c7f2d39a4fc681e5cc8406139 Author: Peter Turcsanyi AuthorDate: Fri Feb 9 21:37:36 2024 +0100 NIFI-12769 Updated copyright year to 2024 in NOTICE file headers This closes #8385. Signed-off-by: Joseph Witt --- NOTICE | 2 +- minifi/minifi-assembly/NOTICE | 2 +- .../minifi-framework-nar/src/main/resources/META-INF/NOTICE | 2 +- .../minifi-framework/minifi-server/src/main/resources/META-INF/NOTICE | 2 +- .../minifi-server-nar/src/main/resources/META-INF/NOTICE| 2 +- .../minifi-provenance-repository-nar/src/main/resources/META-INF/NOTICE | 2 +- .../minifi-standard-nar/src/main/resources/META-INF/NOTICE | 2 +- .../minifi-update-attribute-nar/src/main/resources/META-INF/NOTICE | 2 +- minifi/minifi-toolkit/minifi-toolkit-assembly/NOTICE| 2 +- nifi-assembly/NOTICE| 2 +- nifi-docs/NOTICE| 2 +- nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/NOTICE | 2 +- .../nifi-airtable-nar/src/main/resources/META-INF/NOTICE| 2 +- .../nifi-atlas-bundle/nifi-atlas-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-avro-bundle/nifi-avro-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-beats-bundle/nifi-beats-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-cdc-mysql-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-compress-nar/src/main/resources/META-INF/NOTICE| 2 +- .../nifi-confluent-platform-nar/src/main/resource/META-INF/NOTICE | 2 +- .../nifi-couchbase-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-couchbase-services-api-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-easyrules-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-email-bundle/nifi-email-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-hadoop-utils/src/main/resources/META-INF/NOTICE| 2 +- .../nifi-framework-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-framework-bundle/nifi-framework/nifi-resources/NOTICE | 2 +- .../nifi-web/nifi-web-docs/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-web/nifi-web-ui/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-headless-server-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-server-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-groovyx-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-hadoop-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-hadoop-libraries-nar/src/main/resources/META-INF/NOTICE| 2 +- .../nifi-hashicorp-vault-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-hbase-bundle/nifi-hbase-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-hive-bundle/nifi-hive-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-hive_1_1-nar/src/main/resources/META-INF/NOTICE| 2 +- .../nifi-hubspot-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-iceberg-processors-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-iceberg-services-api-nar/src/main/resources/META-INF/NOTICE| 2 +- .../nifi-iceberg-services-nar/src/main/resources/META-INF/NOTICE| 2 +- nifi-nar-bundles/nifi-jetty-bundle/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-jms-cf-service-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-jms-processors-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-jolt-record-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-kafka-1-0-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-kafka-2-0-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-kafka-2-6-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-kerberos-iaa-providers-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-kudu-bundle/nifi-kudu-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-ldap-iaa-providers-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-mqtt-bundle/nifi-mqtt-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-opentelemetry-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-parquet-nar/src/main
(nifi) branch main updated: NIFI-12769 Updated copyright year to 2024 in NOTICE file headers This closes #8384.
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 The following commit(s) were added to refs/heads/main by this push: new b6b0b241c3 NIFI-12769 Updated copyright year to 2024 in NOTICE file headers This closes #8384. b6b0b241c3 is described below commit b6b0b241c3a4d71454bb29228a468e40bde1d045 Author: Peter Turcsanyi AuthorDate: Fri Feb 9 21:26:36 2024 +0100 NIFI-12769 Updated copyright year to 2024 in NOTICE file headers This closes #8384. Signed-off-by: Joseph Witt --- NOTICE | 2 +- minifi/minifi-assembly/NOTICE | 2 +- .../minifi-framework-nar/src/main/resources/META-INF/NOTICE | 2 +- .../minifi-framework/minifi-server/src/main/resources/META-INF/NOTICE | 2 +- .../minifi-server-nar/src/main/resources/META-INF/NOTICE| 2 +- .../minifi-provenance-repository-nar/src/main/resources/META-INF/NOTICE | 2 +- .../minifi-standard-nar/src/main/resources/META-INF/NOTICE | 2 +- .../minifi-update-attribute-nar/src/main/resources/META-INF/NOTICE | 2 +- minifi/minifi-toolkit/minifi-toolkit-assembly/NOTICE| 2 +- nifi-assembly/NOTICE| 2 +- nifi-docs/NOTICE| 2 +- nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/NOTICE | 2 +- .../nifi-airtable-nar/src/main/resources/META-INF/NOTICE| 2 +- .../nifi-apicurio-nar/src/main/resources/META-INF/NOTICE| 2 +- .../nifi-atlas-bundle/nifi-atlas-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-avro-bundle/nifi-avro-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-beats-bundle/nifi-beats-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-cdc-mysql-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-compress-nar/src/main/resources/META-INF/NOTICE| 2 +- .../nifi-confluent-platform-nar/src/main/resource/META-INF/NOTICE | 2 +- .../nifi-couchbase-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-couchbase-services-api-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-email-bundle/nifi-email-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-hadoop-utils/src/main/resources/META-INF/NOTICE| 2 +- .../nifi-framework-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-framework-bundle/nifi-framework/nifi-resources/NOTICE | 2 +- .../nifi-web/nifi-web-docs/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-web/nifi-web-frontend/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-web/nifi-web-ui/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-headless-server-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-server-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-groovyx-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-hadoop-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-hadoop-libraries-nar/src/main/resources/META-INF/NOTICE| 2 +- .../nifi-hashicorp-vault-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-hbase-bundle/nifi-hbase-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-hubspot-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-iceberg-processors-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-iceberg-services-api-nar/src/main/resources/META-INF/NOTICE| 2 +- .../nifi-iceberg-services-nar/src/main/resources/META-INF/NOTICE| 2 +- nifi-nar-bundles/nifi-jetty-bundle/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-jms-cf-service-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-jms-processors-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-jolt-bundle/nifi-jolt-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-jolt-transform-json-ui/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-kafka-2-6-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-kerberos-iaa-providers-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-kudu-bundle/nifi-kudu-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-ldap-iaa-providers-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-mqtt-bundle/nifi-mqtt-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-opentelemetry-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-parquet-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-provenance-repository-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-questdb-status-history-nar/src/main/resources
(nifi-site) branch main updated: Updating Slack invite links
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-site.git The following commit(s) were added to refs/heads/main by this push: new 2d611e19 Updating Slack invite links 2d611e19 is described below commit 2d611e1934de5e922ea8350a0f17bd1ac26a9b2f Author: Joseph Witt AuthorDate: Fri Feb 9 13:34:35 2024 -0700 Updating Slack invite links --- content/community/contact.md | 2 +- themes/nifi/layouts/partials/footer.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/community/contact.md b/content/community/contact.md index 9b522eda..7001edc8 100644 --- a/content/community/contact.md +++ b/content/community/contact.md @@ -15,7 +15,7 @@ recommendations on how to interact with the community. ## Slack - [Apache NiFi on Slack](https://apachenifi.slack.com/) -- New users can join the workspace using the [invitation link](https://join.slack.com/t/apachenifi/shared_invite/zt-11njbtkdx-ZRU8FKYSWoEHRJetidy0zA) +- New users can join the workspace using the [invitation link](https://join.slack.com/t/apachenifi/shared_invite/zt-2ccusmst2-l2KrTzJLrGcHOO0V7~XD4g) ## Users Mailing List diff --git a/themes/nifi/layouts/partials/footer.html b/themes/nifi/layouts/partials/footer.html index f955fcf0..bf1e0643 100644 --- a/themes/nifi/layouts/partials/footer.html +++ b/themes/nifi/layouts/partials/footer.html @@ -25,7 +25,7 @@ https://issues.apache.org/jira/browse/NIFI;>Issues https://github.com/apache/nifi;>Source https://www.linkedin.com/company/apache-nifi/;>LinkedIn - https://apachenifi.slack.com/;>Slack + https://join.slack.com/t/apachenifi/shared_invite/zt-2ccusmst2-l2KrTzJLrGcHOO0V7~XD4g;>Slack
(nifi) branch main updated: NIFI-12708: add option in UnpackContent to specify encoding charset for filenames in zip unpacking
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 The following commit(s) were added to refs/heads/main by this push: new e00d2b6d5e NIFI-12708: add option in UnpackContent to specify encoding charset for filenames in zip unpacking e00d2b6d5e is described below commit e00d2b6d5e5ef7ffb726251b7edf94d0735ce7a8 Author: Umar Hussain AuthorDate: Fri Feb 2 16:49:11 2024 +0100 NIFI-12708: add option in UnpackContent to specify encoding charset for filenames in zip unpacking This closes #8350 The processor can now take a filename encoding parameter and pass it to zip unpacking. This will allow user to unzip files with specific encoding to get correct filenames in output. This for example help with zip files created on Windows which by default uses Cp437 for filename encoding. If the filename contains special character like German alphabet ä, ü etc., decoding this with Linux's default encoding usually UTF8 output will contain `?` in it. When the same file is processed with property set with `Cp437`, the processor outputs correct filenames with special characters preserved. Signed-off-by: Joseph Witt --- .../nifi-standard-processors/pom.xml | 1 + .../nifi/processors/standard/UnpackContent.java| 114 + .../processors/standard/TestUnpackContent.java | 105 +++ .../TestUnpackContent/windows-with-cp437.zip | Bin 0 -> 644 bytes 4 files changed, 180 insertions(+), 40 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 e514b21466..1048db9509 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 @@ -697,6 +697,7 @@ src/test/resources/TestUnpackContent/folder/cal.txt src/test/resources/TestUnpackContent/folder/date.txt src/test/resources/TestUnpackContent/invalid_data.zip + src/test/resources/TestUnpackContent/windows-with-cp437.zip src/test/resources/TestUpdateRecord/input/addresses.json src/test/resources/TestUpdateRecord/input/embedded-string.json src/test/resources/TestUpdateRecord/input/multi-arrays.json diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java index 3b736aaa6c..34b8573389 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java @@ -16,6 +16,7 @@ */ package org.apache.nifi.processors.standard; +import java.nio.charset.Charset; import net.lingala.zip4j.io.inputstream.ZipInputStream; import net.lingala.zip4j.model.LocalFileHeader; import net.lingala.zip4j.model.enums.EncryptionMethod; @@ -24,6 +25,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream; +import org.apache.commons.io.Charsets; import org.apache.nifi.annotation.behavior.InputRequirement; import org.apache.nifi.annotation.behavior.InputRequirement.Requirement; import org.apache.nifi.annotation.behavior.ReadsAttribute; @@ -34,6 +36,7 @@ import org.apache.nifi.annotation.behavior.WritesAttributes; import org.apache.nifi.annotation.documentation.CapabilityDescription; import org.apache.nifi.annotation.documentation.SeeAlso; import org.apache.nifi.annotation.documentation.Tags; +import org.apache.nifi.annotation.documentation.UseCase; import org.apache.nifi.annotation.lifecycle.OnScheduled; import org.apache.nifi.annotation.lifecycle.OnStopped; import org.apache.nifi.components.PropertyDescriptor; @@ -104,6 +107,13 @@ import java.util.regex.Pattern; @WritesAttribute(attribute = "file.permissions", description = "The read/write/execute permissions of the unpacked file (tar only)"), @WritesAttribute(attribute = "file.encryptionMethod", description = "The encryption method for entries in Zip archives")}) @SeeAlso(MergeContent.class) +@UseCase( +description = "Unpack Zip containing filenames with special characters, created on
(nifi) branch main updated: NIFI-12681: Remove standard services api nar version so it is inherited.
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
The following commit(s) were added to refs/heads/main by this push:
new ddc12b94be NIFI-12681: Remove standard services api nar version so it
is inherited.
ddc12b94be is described below
commit ddc12b94be176e47ab9c794616d0404020d3edfc
Author: bpaulin
AuthorDate: Sat Jan 27 14:30:55 2024 -0600
NIFI-12681: Remove standard services api nar version so it is inherited.
This closes #8308.
Signed-off-by: Joseph Witt
---
.../resources/archetype-resources/nifi-__artifactBaseName__-nar/pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git
a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-nar/pom.xml
b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-nar/pom.xml
index 2737b68a88..4474300e05 100644
---
a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-nar/pom.xml
+++
b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-nar/pom.xml
@@ -35,7 +35,6 @@
org.apache.nifi
nifi-standard-services-api-nar
-${version}
nar
(nifi) branch main updated: NIFI-12676 Fixed Servlet Registration in HandleHttpRequest This closes #8304.
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
The following commit(s) were added to refs/heads/main by this push:
new 103e350943 NIFI-12676 Fixed Servlet Registration in HandleHttpRequest
This closes #8304.
103e350943 is described below
commit 103e350943233c6a780ab1086b2da9872df7c312
Author: exceptionfactory
AuthorDate: Thu Jan 25 16:12:04 2024 -0600
NIFI-12676 Fixed Servlet Registration in HandleHttpRequest
This closes #8304.
Signed-off-by: Joseph Witt
---
.../processors/standard/HandleHttpRequest.java | 8 +--
.../processors/standard/HandleHttpRequestTest.java | 61 +-
2 files changed, 64 insertions(+), 5 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
index de7ff1ad7a..6cc07da11a 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
@@ -51,9 +51,8 @@ import org.apache.nifi.scheduling.ExecutionNode;
import org.apache.nifi.ssl.RestrictedSSLContextService;
import org.apache.nifi.ssl.SSLContextService;
import org.apache.nifi.stream.io.StreamUtils;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
import org.eclipse.jetty.ee10.servlet.ServletContextRequest;
-import org.eclipse.jetty.ee10.servlet.ServletHandler;
-import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
@@ -485,8 +484,9 @@ public class HandleHttpRequest extends AbstractProcessor {
}
}
};
-final ServletHandler servletHandler = new ServletHandler();
-servletHandler.addServlet(new ServletHolder(standardServlet));
+final ServletContextHandler handler = new ServletContextHandler();
+handler.addServlet(standardServlet, "/");
+server.setHandler(handler);
this.server = server;
server.start();
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/HandleHttpRequestTest.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/HandleHttpRequestTest.java
index 0bc5ae8b3f..5ccc1ab2c7 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/HandleHttpRequestTest.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/HandleHttpRequestTest.java
@@ -27,6 +27,17 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
@@ -36,14 +47,19 @@ class HandleHttpRequestTest {
private static final String MINIMUM_THREADS = "8";
+private static final String URL_FORMAT = "http://127.0.0.1:%d;;
+
@Mock
HttpContextMap httpContextMap;
TestRunner runner;
+HandleHttpRequest handleHttpRequest;
+
@BeforeEach
void setRunner() throws InitializationException {
-runner = TestRunners.newTestRunner(HandleHttpRequest.class);
+handleHttpRequest = new HandleHttpRequest();
+runner = TestRunners.newTestRunner(handleHttpRequest);
when(httpContextMap.getIdentifier()).thenReturn(CONTEXT_MAP_ID);
runner.addControllerService(CONTEXT_MAP_ID, httpContextMap);
@@ -72,4 +88,47 @@ class HandleHttpRequestTest {
runner.assertTransferCount(HandleHttpRequest.REL_SUCCESS, 0);
}
+
+@Test
+void testRunMethodNotAllowed() throws InterruptedException {
+runner.setProperty(HandleHttpRequest.HTTP_CONTEXT_MAP, CONTEXT_MAP_ID);
+runner.setProperty(HandleHttpRequest.MAXIMUM_THREADS, MINIMUM_THREADS);
+runner.setProperty(HandleHttpRequest.PORT, "0");
+runner.setProperty(HandleHttpRequest.ALLOW_GET,
Boolean.FALSE
(nifi) branch support/nifi-1.x updated: NIFI-12606: Upgrade parent Apache POM to version 31
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 037ab2886f NIFI-12606: Upgrade parent Apache POM to version 31 037ab2886f is described below commit 037ab2886fbf017e67074773b618c3ce8c96abeb Author: Matt Burgess AuthorDate: Fri Jan 12 15:34:51 2024 -0500 NIFI-12606: Upgrade parent Apache POM to version 31 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4bfd115153..58126bf940 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.apache apache -30 +31 org.apache.nifi
(nifi) branch main updated: NIFI-12606: Upgrade parent Apache POM to version 31 This closes #8242.
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 The following commit(s) were added to refs/heads/main by this push: new be16a423ed NIFI-12606: Upgrade parent Apache POM to version 31 This closes #8242. be16a423ed is described below commit be16a423ed8a1082e1692bfe75e7afe3660e4e35 Author: Matt Burgess AuthorDate: Fri Jan 12 15:34:51 2024 -0500 NIFI-12606: Upgrade parent Apache POM to version 31 This closes #8242. Signed-off-by: Joseph Witt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d73af259d..348b0f27d1 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.apache apache -30 +31 org.apache.nifi
(nifi) branch main updated: NIFI-12607 This closes #8243. remove kernel 2.6 TIMED_WAIT documentation
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 The following commit(s) were added to refs/heads/main by this push: new 2179d16bdc NIFI-12607 This closes #8243. remove kernel 2.6 TIMED_WAIT documentation 2179d16bdc is described below commit 2179d16bdc3b79b34fce111ce6272561faec08c5 Author: theBestAndrew <13425633+thebestand...@users.noreply.github.com> AuthorDate: Fri Jan 12 16:23:48 2024 -0500 NIFI-12607 This closes #8243. remove kernel 2.6 TIMED_WAIT documentation Signed-off-by: Joseph Witt --- nifi-docs/src/main/asciidoc/administration-guide.adoc | 6 -- 1 file changed, 6 deletions(-) diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc index 332290f382..8da36bdcbd 100644 --- a/nifi-docs/src/main/asciidoc/administration-guide.adoc +++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc @@ -159,12 +159,6 @@ Set how long sockets stay in a TIMED_WAIT state when closed:: You don't want your sockets to sit and linger too long given that you want to be able to quickly setup and teardown new sockets. It is a good idea to read more about it and adjust to something like - -for kernel 2.6 - -sudo sysctl -w net.ipv4.netfilter.ip_conntrack_tcp_timeout_time_wait="1" - -for kernel 3.0 sudo sysctl -w net.netfilter.nf_conntrack_tcp_timeout_time_wait="1"
(nifi) branch main updated: NIFI-12532: This closes #8179. Ensure that when CommunicateAction completes (exceptionally or otherwise) that it gets removed from the list of all CommunicationActions
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
The following commit(s) were added to refs/heads/main by this push:
new c670161cb0 NIFI-12532: This closes #8179. Ensure that when
CommunicateAction completes (exceptionally or otherwise) that it gets removed
from the list of all CommunicationActions
c670161cb0 is described below
commit c670161cb09855b28e444a4d32d37427b31e8422
Author: Mark Payne
AuthorDate: Thu Dec 21 10:49:15 2023 -0500
NIFI-12532: This closes #8179. Ensure that when CommunicateAction completes
(exceptionally or otherwise) that it gets removed from the list of all
CommunicationActions
Signed-off-by: Joseph Witt
---
.../server/ConnectionLoadBalanceServer.java| 50 +-
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/server/ConnectionLoadBalanceServer.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/server/ConnectionLoadBalanceServer.java
index 20b955..f5c7c644ca 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/server/ConnectionLoadBalanceServer.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/server/ConnectionLoadBalanceServer.java
@@ -17,6 +17,17 @@
package org.apache.nifi.controller.queue.clustered.server;
+import org.apache.commons.io.IOUtils;
+import org.apache.nifi.events.EventReporter;
+import org.apache.nifi.io.socket.SocketUtils;
+import org.apache.nifi.reporting.Severity;
+import org.apache.nifi.security.util.TlsPlatform;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLServerSocket;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.IOException;
@@ -31,17 +42,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLPeerUnverifiedException;
-import javax.net.ssl.SSLServerSocket;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.nifi.events.EventReporter;
-import org.apache.nifi.io.socket.SocketUtils;
-import org.apache.nifi.reporting.Severity;
-import org.apache.nifi.security.util.TlsPlatform;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class ConnectionLoadBalanceServer {
private static final Logger logger =
LoggerFactory.getLogger(ConnectionLoadBalanceServer.class);
@@ -104,10 +104,12 @@ public class ConnectionLoadBalanceServer {
acceptConnection.stop();
}
-final Iterator itr =
communicationActions.iterator();
-while (itr.hasNext()) {
-itr.next().stop();
-itr.remove();
+synchronized (communicationActions) { // Must synchronize on
Synchronized List when using iterator
+final Iterator itr =
communicationActions.iterator();
+while (itr.hasNext()) {
+itr.next().stop();
+itr.remove();
+}
}
}
@@ -135,8 +137,7 @@ public class ConnectionLoadBalanceServer {
private volatile boolean stopped = false;
-// This should be final but it is not to allow override during
testing; no production code modifies the value
-private static int EXCEPTION_THRESHOLD_MILLIS = 10_000;
+private static final int EXCEPTION_THRESHOLD_MILLIS = 10_000;
private volatile long tlsErrorLastSeen = -1;
public CommunicateAction(final LoadBalanceProtocol
loadBalanceProtocol, final Socket socket, final EventReporter eventReporter)
throws IOException {
@@ -187,6 +188,8 @@ public class ConnectionLoadBalanceServer {
logger.error("Failed to communicate over Channel {}",
channelDescription, e);
eventReporter.reportEvent(Severity.ERROR, "Load
Balanced Connection", "Failed to receive FlowFiles for Load Balancing due to "
+ e);
}
+
+return;
}
}
}
@@ -265,11 +268,18 @@ public class ConnectionLoadBalanceServer {
socket.setSoTimeout(connectionTimeoutMillis);
final CommunicateAction communicateAction = new
CommunicateAction(loadBalanceProtocol, socket, eventReporter);
-final Thread commsThread = new Thread(communicateAction);
+communicatio
(nifi) branch support/nifi-1.x updated: NIFI-12535: Fixed documentation for 'PadRight Examples' table name in the Expression Language Guide as well as the last example in the table.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 29821f6e71 NIFI-12535: Fixed documentation for 'PadRight Examples'
table name in the Expression Language Guide as well as the last example in the
table.
29821f6e71 is described below
commit 29821f6e71a5d763863e191d223c8fb7fda519c0
Author: Alex Ethier
AuthorDate: Thu Dec 21 13:12:08 2023 -0500
NIFI-12535: Fixed documentation for 'PadRight Examples' table name in the
Expression Language Guide as well as the last example in the table.
Signed-off-by: Joseph Witt
---
nifi-docs/src/main/asciidoc/expression-language-guide.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
b/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
index 321c334517..14620851f1 100644
--- a/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
@@ -1085,13 +1085,13 @@ Expressions will provide the following results:
-.PadLeft Examples
+.PadRight Examples
|===
| Expression | Value
| `${greetings:padRight(10)}` | `hello\_`
| `${greetings:padRight(10, '@')}` | `hello@`
| `${greetings:padRight(10, 'xy')}` | `helloxyxyx`
-| `${greetings:padLeft(10, 'aVeryLongPaddingString')}` | `helloaVery`
+| `${greetings:padRight(10, 'aVeryLongPaddingString')}` | `helloaVery`
|===
(nifi) branch main updated: NIFI-12535: This closes #8181. Fixed documentation for 'PadRight Examples' table name in the Expression Language Guide as well as the last example in the table.
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
The following commit(s) were added to refs/heads/main by this push:
new 77093671e0 NIFI-12535: This closes #8181. Fixed documentation for
'PadRight Examples' table name in the Expression Language Guide as well as the
last example in the table.
77093671e0 is described below
commit 77093671e0ff90379ffc0fdf5be502cdf6988868
Author: Alex Ethier
AuthorDate: Thu Dec 21 13:12:08 2023 -0500
NIFI-12535: This closes #8181. Fixed documentation for 'PadRight Examples'
table name in the Expression Language Guide as well as the last example in the
table.
Signed-off-by: Joseph Witt
---
nifi-docs/src/main/asciidoc/expression-language-guide.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
b/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
index 2163d78e6b..e2c30cb6fb 100644
--- a/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
@@ -1078,13 +1078,13 @@ Expressions will provide the following results:
-.PadLeft Examples
+.PadRight Examples
|===
| Expression | Value
| `${greetings:padRight(10)}` | `hello\_`
| `${greetings:padRight(10, '@')}` | `hello@`
| `${greetings:padRight(10, 'xy')}` | `helloxyxyx`
-| `${greetings:padLeft(10, 'aVeryLongPaddingString')}` | `helloaVery`
+| `${greetings:padRight(10, 'aVeryLongPaddingString')}` | `helloaVery`
|===
(nifi) branch main updated: NIFI-12528: This closes #8180. Fixed bug that resulted in StackOverflowError when deleting loop containing only funnels
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
The following commit(s) were added to refs/heads/main by this push:
new c41b273e82 NIFI-12528: This closes #8180. Fixed bug that resulted in
StackOverflowError when deleting loop containing only funnels
c41b273e82 is described below
commit c41b273e82c69466d4e518b814964883289edba7
Author: Mark Payne
AuthorDate: Thu Dec 21 11:07:39 2023 -0500
NIFI-12528: This closes #8180. Fixed bug that resulted in
StackOverflowError when deleting loop containing only funnels
Signed-off-by: Joseph Witt
---
.../org/apache/nifi/connectable/StandardConnection.java | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/connectable/StandardConnection.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/connectable/StandardConnection.java
index a2a6185b7b..9ef3b9fa39 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/connectable/StandardConnection.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/connectable/StandardConnection.java
@@ -41,6 +41,7 @@ import org.apache.nifi.remote.RemoteGroupPort;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -500,6 +501,16 @@ public final class StandardConnection implements
Connection {
}
private void verifySourceStoppedOrFunnel(final Connection connection) {
+verifySourceStoppedOrFunnel(connection, new HashSet<>());
+}
+
+private void verifySourceStoppedOrFunnel(final Connection connection,
final Set connectionsSeen) {
+final boolean added = connectionsSeen.add(connection);
+if (!added) {
+// If we've already seen this Connection, no need to process it
again.
+return;
+}
+
final Connectable sourceComponent = connection.getSource();
if (!sourceComponent.isRunning()) {
return;
@@ -513,7 +524,7 @@ public final class StandardConnection implements Connection
{
// Source is a funnel and is running. We need to then check all of its
upstream components.
for (final Connection incoming :
sourceComponent.getIncomingConnections()) {
-verifySourceStoppedOrFunnel(incoming);
+verifySourceStoppedOrFunnel(incoming, connectionsSeen);
}
}
(nifi) branch main updated: NIFI-12536: This closes #8178. Used proper method for converting byte array to String
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
The following commit(s) were added to refs/heads/main by this push:
new 2897618635 NIFI-12536: This closes #8178. Used proper method for
converting byte array to String
2897618635 is described below
commit 28976186351fca90178a3c6e4c125568a270cba2
Author: Mark Payne
AuthorDate: Thu Dec 21 10:41:14 2023 -0500
NIFI-12536: This closes #8178. Used proper method for converting byte array
to String
Signed-off-by: Joseph Witt
---
.../nifi-text-embeddings-module/src/main/python/ParseDocument.py| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ParseDocument.py
b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ParseDocument.py
index 6b26f6aa49..a6582cc346 100644
---
a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ParseDocument.py
+++
b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ParseDocument.py
@@ -177,7 +177,7 @@ class ParseDocument(FlowFileTransform):
input_format =
context.getProperty(self.INPUT_FORMAT).evaluateAttributeExpressions(flowFile).getValue()
if input_format == PLAIN_TEXT:
-return [Document(page_content=str(flowFile.getContentsAsBytes()),
metadata=metadata)]
+return
[Document(page_content=flowFile.getContentsAsBytes().decode('utf-8'),
metadata=metadata)]
element_strategy =
context.getProperty(self.ELEMENT_STRATEGY).getValue()
if element_strategy == SINGLE_DOCUMENT:
(nifi) branch support/nifi-1.x updated: NIFI-12450 This closes #8103. Added Deprecation Warning for Bootstrap Notifications
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 60fe794906 NIFI-12450 This closes #8103. Added Deprecation Warning for
Bootstrap Notifications
60fe794906 is described below
commit 60fe7949067764f27ae898a7335aed569f64097c
Author: exceptionfactory
AuthorDate: Fri Dec 1 20:31:18 2023 -0600
NIFI-12450 This closes #8103. Added Deprecation Warning for Bootstrap
Notifications
Signed-off-by: Joseph Witt
---
nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
index 586b6fc53a..ee5c193f04 100644
--- a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
+++ b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
@@ -419,6 +419,7 @@ public class RunNiFi {
defaultLogger.info("Registered no Notification Services for
Notification Type {}", type);
return;
}
+deprecationLogger.warn("Bootstrap Notification Services are deprecated
[{}]", serviceIds);
int registered = 0;
for (final String id : serviceIds.split(",")) {
(nifi) branch main updated: NIFI-11788 Modified APP_FILE logback configuration to have better cleanup NIFI-11788 Standardized Logback maximum settings - Set MiNiFi maxHistory to 10 and totalSizeCap to
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
The following commit(s) were added to refs/heads/main by this push:
new 6447aea258 NIFI-11788 Modified APP_FILE logback configuration to have
better cleanup NIFI-11788 Standardized Logback maximum settings - Set MiNiFi
maxHistory to 10 and totalSizeCap to 10MB - Set NiFi maxHistory to 30 and
totalSizeCap to 3GB except for deprecation log - Set Stateless maxHistory to 30
and totalSizeCap to 3GB - Set Registry maxHistory to 30 and totalSizeCap to 3GB
NIFI-11788 Increased MiNiFi maxFileSize to 10MB and cap to 100MB
6447aea258 is described below
commit 6447aea2583eec08e44f40b3ad8371d15965f25c
Author: Mike Thomsen
AuthorDate: Sat Jul 8 22:05:02 2023 -0400
NIFI-11788 Modified APP_FILE logback configuration to have better cleanup
NIFI-11788 Standardized Logback maximum settings
- Set MiNiFi maxHistory to 10 and totalSizeCap to 10MB
- Set NiFi maxHistory to 30 and totalSizeCap to 3GB except for deprecation
log
- Set Stateless maxHistory to 30 and totalSizeCap to 3GB
- Set Registry maxHistory to 30 and totalSizeCap to 3GB
NIFI-11788 Increased MiNiFi maxFileSize to 10MB and cap to 100MB
This closes #7465. Coauthored by David Handermann and Mike Thomsen
Signed-off-by: Joseph Witt
---
.../src/main/resources/conf/logback.xml| 22 +++
.../src/main/resources/conf/logback.xml| 44 +++---
.../src/main/resources/conf/stateless-logback.xml | 7 +++-
.../src/main/resources/conf/logback.xml| 29 ++
.../src/main/resources/conf/stateless-logback.xml | 7 +++-
5 files changed, 88 insertions(+), 21 deletions(-)
diff --git
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
index 2b470d7180..72fd36cd94 100644
---
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
+++
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
@@ -29,12 +29,14 @@
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
${org.apache.nifi.minifi.bootstrap.config.log.dir}/${org.apache.nifi.minifi.bootstrap.config.log.app.file.name}_%d{-MM-dd_HH}.%i.${org.apache.nifi.minifi.bootstrap.config.log.app.file.extension}.gz
-
+
+10MB
+
10
-
-1MB
-
-10MB
+
+100MB
+
+true
true
@@ -52,8 +54,14 @@
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
${org.apache.nifi.minifi.bootstrap.config.log.dir}/${org.apache.nifi.minifi.bootstrap.config.log.bootstrap.file.name}_%d.${org.apache.nifi.minifi.bootstrap.config.log.bootstrap.file.extension}.gz
-
-5
+
+10MB
+
+10
+
+100MB
+
+true
%date %level [%thread] %logger{40} %msg%n
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
index b13218d62f..3e9c1aa8e3 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
@@ -31,9 +31,14 @@
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
${org.apache.nifi.bootstrap.config.log.dir}/nifi-app_%d{-MM-dd_HH}.%i.log
+
100MB
-
+
30
+
+3GB
+
+true
true
@@ -51,8 +56,14 @@
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
${org.apache.nifi.bootstrap.config.log.dir}/nifi-user_%d.log
-
+
+100MB
+
30
+
+3GB
+
+true
%date %level [%thread] %logger{40} %msg%n
@@ -63,7 +74,14 @@
${org.apache.nifi.bootstrap.config.log.dir}/nifi-request.log
${org.apache.nifi.bootstrap.config.log.dir}/nifi-request_%d.log
+
+100MB
+
30
+
+
(nifi) branch main updated: NIFI-12288 This closes #7950. Improved Long and Integer handling in Utilities
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
The following commit(s) were added to refs/heads/main by this push:
new ae14738dea NIFI-12288 This closes #7950. Improved Long and Integer
handling in Utilities
ae14738dea is described below
commit ae14738dead33ca20dc2e779f5157118ee2b228f
Author: exceptionfactory
AuthorDate: Fri Oct 27 17:19:50 2023 -0500
NIFI-12288 This closes #7950. Improved Long and Integer handling in
Utilities
- Added explicit round in FormatUtils.makeWholeNumberTime()
- Removed unnecessary boxing in component descriptors
- Maintained long number tracking for releasable counts in Wait and Notify
Processors
Signed-off-by: Joseph Witt
---
.../java/org/apache/nifi/util/FormatUtils.java | 5 +-
.../status/history/ProcessorStatusDescriptor.java | 88 +++---
.../RemoteProcessGroupStatusDescriptor.java| 45 +--
.../processors/standard/WaitNotifyProtocol.java| 9 ++-
.../standard/TestWaitNotifyProtocol.java | 60 ++-
5 files changed, 95 insertions(+), 112 deletions(-)
diff --git
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java
index e5da2520d5..8dec493f64 100644
---
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java
+++
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java
@@ -217,7 +217,7 @@ public class FormatUtils {
durationLong = Math.round(durationVal);
} else {
// Try reducing the size of the units to make the input a long
-List wholeResults = makeWholeNumberTime(durationVal,
specifiedTimeUnit);
+List wholeResults = makeWholeNumberTime(durationVal,
specifiedTimeUnit);
durationLong = (long) wholeResults.get(0);
specifiedTimeUnit = (TimeUnit) wholeResults.get(1);
}
@@ -247,7 +247,8 @@ public class FormatUtils {
protected static List makeWholeNumberTime(double decimal, TimeUnit
timeUnit) {
// If the value is already a whole number, return it and the current
time unit
if (decimal == Math.rint(decimal)) {
-return Arrays.asList(new Object[]{(long) decimal, timeUnit});
+final long rounded = Math.round(decimal);
+return Arrays.asList(new Object[]{rounded, timeUnit});
} else if (TimeUnit.NANOSECONDS == timeUnit) {
// The time unit is as small as possible
if (decimal < 1.0) {
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/history/ProcessorStatusDescriptor.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/history/ProcessorStatusDescriptor.java
index c8f51267ec..feff921299 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/history/ProcessorStatusDescriptor.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/history/ProcessorStatusDescriptor.java
@@ -57,7 +57,7 @@ public enum ProcessorStatusDescriptor {
"FlowFiles In (5 mins)",
"The number of FlowFiles that this Processor has pulled from its
queues in the past 5 minutes",
Formatter.COUNT,
-s -> Long.valueOf(s.getInputCount())),
+s -> (long) s.getInputCount()),
OUTPUT_BYTES(
"outputBytes",
@@ -71,14 +71,14 @@ public enum ProcessorStatusDescriptor {
"FlowFiles Out (5 mins)",
"The number of FlowFiles that this Processor has transferred to
downstream queues in the past 5 minutes",
Formatter.COUNT,
-s -> Long.valueOf(s.getOutputCount())),
+s -> (long) s.getOutputCount()),
TASK_COUNT(
"taskCount",
"Tasks (5 mins)",
"The number of tasks that this Processor has completed in the past 5
minutes",
Formatter.COUNT,
-s -> Long.valueOf(s.getInvocations())),
+s -> (long) s.getInvocations()),
TASK_MILLIS(
"taskMillis",
@@ -100,7 +100,7 @@ public enum ProcessorStatusDescriptor {
"FlowFiles Removed (5 mins)",
"The total number of FlowFiles removed by this Processor in the last 5
minutes",
Formatter.COUNT,
-s -> Long.valueOf(s.getFlowFilesRemoved())),
+s -> (long) s.getFlowFilesRemoved()),
AVERAGE_LINEAGE_DURATION(
"averageLineageDuration",
@@ -108,27 +108,27 @@ public enum Proce
[nifi] branch main updated: NIFI-12124: This closes #7791. Added a new RenameRecordField processor. In testing, also noticed that the Descendant Wildcard operator (//*) and Descendant Field Path Opera
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
The following commit(s) were added to refs/heads/main by this push:
new 3ae0eedee6 NIFI-12124: This closes #7791. Added a new
RenameRecordField processor. In testing, also noticed that the Descendant
Wildcard operator (//*) and Descendant Field Path Operator (//name, for
instance) did not properly account for array of records or map elements, so
addressed those concerns.
3ae0eedee6 is described below
commit 3ae0eedee6ae67c48dd59f68752fa728e4355c41
Author: Mark Payne
AuthorDate: Mon Sep 25 13:19:30 2023 -0400
NIFI-12124: This closes #7791. Added a new RenameRecordField processor. In
testing, also noticed that the Descendant Wildcard operator (//*) and
Descendant Field Path Operator (//name, for instance) did not properly account
for array of records or map elements, so addressed those concerns.
Signed-off-by: Joseph Witt
---
.github/workflows/ci-workflow.yml | 3 +
.../record/path/paths/DescendantFieldPath.java | 26 ++-
.../record/path/paths/WildcardDescendantPath.java | 26 ++-
.../org/apache/nifi/record/path/util/Filters.java | 38 +++-
.../apache/nifi/record/path/TestRecordPath.java| 76 ++--
.../nifi/serialization/SimpleRecordSchema.java | 70 +--
.../nifi/serialization/record/MapRecord.java | 28 +++
.../apache/nifi/serialization/record/Record.java | 14 +-
.../nifi/serialization/record/RecordSchema.java| 10 +
.../org/apache/nifi/accumulo/data/KeySchema.java | 14 +-
.../processors/standard/RenameRecordField.java | 209 +
.../services/org.apache.nifi.processor.Processor | 1 +
.../processors/standard/TestRenameRecordField.java | 182 ++
.../input/complex-person.json | 12 ++
.../TestRenameRecordField/input/simple-person.json | 5 +
.../output/testNestedPath.json | 12 ++
.../testRecursivelyReferencingAllFields.json | 12 ++
.../testRecursivelyReferencingFieldName.json | 12 ++
.../output/testReferencingFieldName.json | 5 +
.../output/testRenameArray.json| 12 ++
.../output/testRenameFieldStaticValue.json | 5 +
.../output/testRenameFieldUsingAttribute.json | 5 +
.../output/testRenameMultipleFields.json | 5 +
23 files changed, 740 insertions(+), 42 deletions(-)
diff --git a/.github/workflows/ci-workflow.yml
b/.github/workflows/ci-workflow.yml
index 3f9ee8a7f5..439fdff8b6 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -172,6 +172,7 @@ jobs:
if: failure()
- name: Post Disk Usage
run: df
+if: ${{ always() }}
macos-build-jp:
timeout-minutes: 150
@@ -235,6 +236,7 @@ jobs:
if: failure()
- name: Post Disk Usage
run: df
+if: ${{ always() }}
windows-build:
timeout-minutes: 150
@@ -300,3 +302,4 @@ jobs:
if: failure()
- name: Post Disk Usage
run: df
+if: ${{ always() }}
diff --git
a/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/paths/DescendantFieldPath.java
b/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/paths/DescendantFieldPath.java
index 8946bc102c..60852f16ac 100644
---
a/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/paths/DescendantFieldPath.java
+++
b/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/paths/DescendantFieldPath.java
@@ -20,14 +20,18 @@ package org.apache.nifi.record.path.paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import java.util.stream.Stream;
-
import org.apache.nifi.record.path.FieldValue;
+import org.apache.nifi.record.path.MapEntryFieldValue;
import org.apache.nifi.record.path.RecordPathEvaluationContext;
import org.apache.nifi.record.path.StandardFieldValue;
import org.apache.nifi.record.path.util.Filters;
+import org.apache.nifi.serialization.record.DataType;
import org.apache.nifi.serialization.record.Record;
import org.apache.nifi.serialization.record.RecordField;
+import org.apache.nifi.serialization.record.RecordFieldType;
+import org.apache.nifi.serialization.record.type.MapDataType;
public class DescendantFieldPath extends RecordPathSegment {
private final String descendantName;
@@ -74,6 +78,26 @@ public class DescendantFieldPath extends RecordPathSegment {
if (Filters.isRecord(childField.getDataType(), recordValue)) {
final FieldValue childFieldValue = new
StandardFieldValue(recordValue, childField, fieldValue);
matchingValues.addAll(findDescendants(childFieldValue));
+} else if (Filters.isRecordArray(childField.getDataType(),
recordValue
[nifi] branch main updated: NIFI-12221: This closes #7876. Be more lenient about which Disconnection Codes we allow a node to be reconnected to a cluster vs. when we notify the node to disconnect agai
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
The following commit(s) were added to refs/heads/main by this push:
new f4ae292a45 NIFI-12221: This closes #7876. Be more lenient about which
Disconnection Codes we allow a node to be reconnected to a cluster vs. when we
notify the node to disconnect again. Also updated the timeout for OffloadIT
because it occasionally times ou out while running properly.
f4ae292a45 is described below
commit f4ae292a457638d3226fb0491e5186fa52ae8518
Author: Mark Payne
AuthorDate: Thu Oct 12 16:43:21 2023 -0400
NIFI-12221: This closes #7876. Be more lenient about which Disconnection
Codes we allow a node to be reconnected to a cluster vs. when we notify the
node to disconnect again. Also updated the timeout for OffloadIT because it
occasionally times ou out while running properly.
Signed-off-by: Joseph Witt
---
.../coordination/heartbeat/AbstractHeartbeatMonitor.java | 12 +++-
.../org/apache/nifi/tests/system/clustering/OffloadIT.java | 5 +
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/AbstractHeartbeatMonitor.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/AbstractHeartbeatMonitor.java
index c8a77ed2f0..549b030804 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/AbstractHeartbeatMonitor.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/AbstractHeartbeatMonitor.java
@@ -254,20 +254,22 @@ public abstract class AbstractHeartbeatMonitor implements
HeartbeatMonitor {
case LACK_OF_HEARTBEAT:
case UNABLE_TO_COMMUNICATE:
case NOT_YET_CONNECTED:
-case STARTUP_FAILURE: {
+case MISMATCHED_FLOWS:
+case MISSING_BUNDLE:
+case NODE_SHUTDOWN:
+case FAILED_TO_SERVICE_REQUEST:
+case STARTUP_FAILURE:
clusterCoordinator.reportEvent(nodeId, Severity.INFO,
"Received heartbeat from node previously "
+ "disconnected due to " + disconnectionCode + ".
Issuing reconnection request.");
clusterCoordinator.requestNodeConnect(nodeId, null);
break;
-}
-default: {
+default:
// disconnected nodes should not heartbeat, so we need to
issue a disconnection request.
-logger.info("Ignoring received heartbeat from disconnected
node " + nodeId + ". Issuing disconnection request.");
+logger.info("Ignoring received heartbeat from disconnected
node {}. Node was disconnected due to [{}]. Issuing disconnection request.",
nodeId, disconnectionCode);
clusterCoordinator.requestNodeDisconnect(nodeId,
disconnectionCode, connectionStatus.getReason());
removeHeartbeat(nodeId);
break;
-}
}
return;
diff --git
a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/OffloadIT.java
b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/OffloadIT.java
index 818bd0cb23..f2e2266d9d 100644
---
a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/OffloadIT.java
+++
b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/OffloadIT.java
@@ -25,11 +25,13 @@ import org.apache.nifi.web.api.dto.ProcessorConfigDTO;
import org.apache.nifi.web.api.entity.ConnectionEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.Collections;
+import java.util.concurrent.TimeUnit;
public class OffloadIT extends NiFiSystemIT {
private static final Logger logger =
LoggerFactory.getLogger(OffloadIT.class);
@@ -40,6 +42,9 @@ public class OffloadIT extends NiFiSystemIT {
}
@Test
+@Timeout(value = 10, unit = TimeUnit.MINUTES)
+// Test to ensure that node can be offloaded, reconnected, offloaded
several times. This test typically takes only about 1-2 minutes
+// but can occasionally take 5-6 minutes on Github Actions so we set the
timeout
[nifi] branch support/nifi-1.x updated: NIFI-12228: This closes #7882. Fixed issue with FlowFile Concucrrency that can occasionally bring in more data than it should.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 4d00f8e156 NIFI-12228: This closes #7882. Fixed issue with FlowFile
Concucrrency that can occasionally bring in more data than it should.
4d00f8e156 is described below
commit 4d00f8e1563ffec40d8d601ac2b678ad0414bb5b
Author: Mark Payne
AuthorDate: Fri Oct 13 11:03:11 2023 -0400
NIFI-12228: This closes #7882. Fixed issue with FlowFile Concucrrency that
can occasionally bring in more data than it should.
Signed-off-by: Joseph Witt
---
.../nifi/groups/SingleConcurrencyFlowFileGate.java | 17 ++
.../org/apache/nifi/groups/StandardDataValve.java | 27 ++
2 files changed, 34 insertions(+), 10 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/SingleConcurrencyFlowFileGate.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/SingleConcurrencyFlowFileGate.java
index 2282636b57..c006cdb659 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/SingleConcurrencyFlowFileGate.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/SingleConcurrencyFlowFileGate.java
@@ -36,6 +36,16 @@ public class SingleConcurrencyFlowFileGate implements
FlowFileGate {
return false;
}
+// We need to try to open flow into the Port's group. To do this, we
need to get the data valve for the parent group,
+// as it is responsible for data flowing into and out of its children.
+final ProcessGroup dataValveGroup = port.getProcessGroup().getParent();
+final DataValve dataValve = dataValveGroup.getDataValve();
+final boolean openFlowIntoGroup =
dataValve.tryOpenFlowIntoGroup(port.getProcessGroup());
+if (!openFlowIntoGroup) {
+claimed.set(false);
+return false;
+}
+
// The claim is now held by this thread. Check if the ProcessGroup is
empty.
final boolean empty = !port.getProcessGroup().isDataQueued();
if (empty) {
@@ -43,6 +53,9 @@ public class SingleConcurrencyFlowFileGate implements
FlowFileGate {
return true;
}
+// We have already opened flow into group, so now we must close it,
since we are not allowing flow in
+dataValve.closeFlowIntoGroup(port.getProcessGroup());
+
// Process Group was not empty, so we cannot allow any more FlowFiles
through. Reset claimed to false and return false,
// indicating that the caller did not obtain the claim.
claimed.set(false);
@@ -52,5 +65,9 @@ public class SingleConcurrencyFlowFileGate implements
FlowFileGate {
@Override
public void releaseClaim(final Port port) {
claimed.set(false);
+
+final ProcessGroup dataValveGroup = port.getProcessGroup().getParent();
+final DataValve dataValve = dataValveGroup.getDataValve();
+dataValve.closeFlowIntoGroup(port.getProcessGroup());
}
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardDataValve.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardDataValve.java
index df5658638f..5c1c1ee5ec 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardDataValve.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardDataValve.java
@@ -84,10 +84,15 @@ public class StandardDataValve implements DataValve {
if (destinationGroup.isDataQueued()) {
// If the destination group already has data queued up, and the
valve is not already open, do not allow data to
// flow into the group. If we did, we would end up mixing together
two different batches of data.
-logger.debug("Will not allow data to flow into {} because valve is
not already open and the Process Group has data queued", destinationGroup);
+logger.trace("Will not allow data to flow into {} because valve is
not already open and the Process Group has data queued", destinationGroup);
return "Process Group already has data queued and valve is not
already allowing data into group";
}
+if (destinationGroup.getFlowFileOutboundPolicy() ==
FlowFileOutboundPolicy.BATCH_OUTPUT &&a
[nifi] branch main updated: NIFI-12228: This closes #7881. Fixed issue with FlowFile Concucrrency that can occasionally bring in more data than it should. Code cleanup, fixing logback to avoid INFO-le
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
The following commit(s) were added to refs/heads/main by this push:
new 0eabbcdf19 NIFI-12228: This closes #7881. Fixed issue with FlowFile
Concucrrency that can occasionally bring in more data than it should. Code
cleanup, fixing logback to avoid INFO-level stack trace from xodus
0eabbcdf19 is described below
commit 0eabbcdf19dfa9de7085b4b173ac3d3260f9d3a4
Author: Mark Payne
AuthorDate: Fri Oct 13 11:03:11 2023 -0400
NIFI-12228: This closes #7881. Fixed issue with FlowFile Concucrrency that
can occasionally bring in more data than it should.
Code cleanup, fixing logback to avoid INFO-level stack trace from xodus
Signed-off-by: Joseph Witt
---
.../org/apache/nifi/connectable/LocalPort.java | 12 +++---
.../nifi/groups/SingleConcurrencyFlowFileGate.java | 17 ++
.../org/apache/nifi/groups/StandardDataValve.java | 27 ++
.../resources/conf/clustered/node1/logback.xml | 3 +++
.../resources/conf/clustered/node2/logback.xml | 3 +++
.../src/test/resources/conf/default/logback.xml| 4 +++-
.../src/test/resources/conf/pythonic/logback.xml | 3 +++
7 files changed, 49 insertions(+), 20 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/connectable/LocalPort.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/connectable/LocalPort.java
index 86366f6eb8..53ffc01937 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/connectable/LocalPort.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/connectable/LocalPort.java
@@ -186,15 +186,9 @@ public class LocalPort extends AbstractPort {
final FlowFileConcurrency flowFileConcurrency =
getProcessGroup().getFlowFileConcurrency();
switch (flowFileConcurrency) {
-case UNBOUNDED:
-transferUnboundedConcurrency(context, session);
-break;
-case SINGLE_FLOWFILE_PER_NODE:
-transferSingleFlowFile(session);
-break;
-case SINGLE_BATCH_PER_NODE:
-transferInputBatch(session);
-break;
+case UNBOUNDED -> transferUnboundedConcurrency(context,
session);
+case SINGLE_FLOWFILE_PER_NODE ->
transferSingleFlowFile(session);
+case SINGLE_BATCH_PER_NODE -> transferInputBatch(session);
}
} finally {
flowFileGate.releaseClaim(this);
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/SingleConcurrencyFlowFileGate.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/SingleConcurrencyFlowFileGate.java
index 2282636b57..c006cdb659 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/SingleConcurrencyFlowFileGate.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/SingleConcurrencyFlowFileGate.java
@@ -36,6 +36,16 @@ public class SingleConcurrencyFlowFileGate implements
FlowFileGate {
return false;
}
+// We need to try to open flow into the Port's group. To do this, we
need to get the data valve for the parent group,
+// as it is responsible for data flowing into and out of its children.
+final ProcessGroup dataValveGroup = port.getProcessGroup().getParent();
+final DataValve dataValve = dataValveGroup.getDataValve();
+final boolean openFlowIntoGroup =
dataValve.tryOpenFlowIntoGroup(port.getProcessGroup());
+if (!openFlowIntoGroup) {
+claimed.set(false);
+return false;
+}
+
// The claim is now held by this thread. Check if the ProcessGroup is
empty.
final boolean empty = !port.getProcessGroup().isDataQueued();
if (empty) {
@@ -43,6 +53,9 @@ public class SingleConcurrencyFlowFileGate implements
FlowFileGate {
return true;
}
+// We have already opened flow into group, so now we must close it,
since we are not allowing flow in
+dataValve.closeFlowIntoGroup(port.getProcessGroup());
+
// Process Group was not empty, so we cannot allow any more FlowFiles
through. Reset claimed to false and return false,
// indicating that the caller did not obtain the claim.
claimed.set(false);
[nifi] branch support/nifi-1.x updated: NIFI-12214 This closes #7869. ConsumeElasticsearch Query Builder properties do not dependOn the Query Definition Style
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new ac435ed7a1 NIFI-12214 This closes #7869. ConsumeElasticsearch Query
Builder properties do not dependOn the Query Definition Style
ac435ed7a1 is described below
commit ac435ed7a18fe1266fed97dfae2864b3ce9123ac
Author: Chris Sampson
AuthorDate: Wed Oct 11 21:00:09 2023 +0100
NIFI-12214 This closes #7869. ConsumeElasticsearch Query Builder properties
do not dependOn the Query Definition Style
Signed-off-by: Joseph Witt
---
.../apache/nifi/components/PropertyDescriptor.java | 30
.../nifi/components/TestPropertyDescriptor.java| 33 ++
.../elasticsearch/ConsumeElasticsearch.java| 32 +
.../elasticsearch/ConsumeElasticsearchTest.java| 8 +++---
.../integration/AbstractElasticsearchITBase.java | 2 +-
nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml | 4 +--
6 files changed, 102 insertions(+), 7 deletions(-)
diff --git
a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
index 2e18ba9c73..f497b4123c 100644
--- a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
+++ b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
@@ -438,6 +438,16 @@ public final class PropertyDescriptor implements
Comparable
return this;
}
+/**
+ * Clears all Allowable Values from this Property
+ *
+ * @return the builder
+ */
+public Builder clearAllowableValues() {
+this.allowableValues = null;
+return this;
+}
+
/**
* Sets the Allowable Values for this Property
*
@@ -480,6 +490,16 @@ public final class PropertyDescriptor implements
Comparable
return this;
}
+/**
+ * Clear all Validators from this Property
+ *
+ * @return the builder
+ */
+public Builder clearValidators() {
+validators.clear();
+return this;
+}
+
/**
* Specifies that this property provides the identifier of a Controller
* Service that implements the given interface
@@ -632,6 +652,16 @@ public final class PropertyDescriptor implements
Comparable
return dependsOn(property, dependentValues);
}
+/**
+ * Clear all Dependencies from this Property
+ *
+ * @return the builder
+ */
+public Builder clearDependsOn() {
+this.dependencies = new HashSet<>();
+return this;
+}
+
private AllowableValue toAllowableValue(DescribedValue describedValue)
{
return new AllowableValue(describedValue.getValue(),
describedValue.getDisplayName(), describedValue.getDescription());
}
diff --git
a/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
b/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
index 288fbcb2ea..6d2769a145 100644
---
a/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
+++
b/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
@@ -35,6 +35,7 @@ import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.anyString;
@@ -188,4 +189,36 @@ public class TestPropertyDescriptor {
// Test the literal value 'target'
assertTrue(withElNotAllowed.validate("target",
validationContext).isValid());
}
+
+@Test
+void testClearingValues() {
+final PropertyDescriptor dep1 = new PropertyDescriptor.Builder()
+.name("dep1")
+.allowableValues("delVal1")
+.build();
+
+final PropertyDescriptor pd1 = new PropertyDescriptor.Builder()
+.name("test")
+.addValidator(Validator.VALID)
+.allowableValues("val1")
+.dependsOn(dep1, "depVal1")
+.build();
+
+final PropertyDescriptor pd2 = new PropertyDescriptor.Builder()
+.fromPropertyDescriptor(pd1)
+.clearValidators()
+.clearAllowableValues()
+.clearDependsO
[nifi] 02/03: NIFI-12214 This closes #7869. ConsumeElasticsearch Query Builder properties do not dependOn the Query Definition Style
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 584b3fc1652809e49f7d8f34602208ad20e6e1d0
Author: Chris Sampson
AuthorDate: Wed Oct 11 21:00:09 2023 +0100
NIFI-12214 This closes #7869. ConsumeElasticsearch Query Builder properties
do not dependOn the Query Definition Style
Signed-off-by: Joseph Witt
---
.../apache/nifi/components/PropertyDescriptor.java | 30
.../nifi/components/TestPropertyDescriptor.java| 33 ++
.../elasticsearch/ConsumeElasticsearch.java| 32 +
.../elasticsearch/ConsumeElasticsearchTest.java| 8 +++---
.../integration/AbstractElasticsearchITBase.java | 2 +-
nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml | 4 +--
6 files changed, 102 insertions(+), 7 deletions(-)
diff --git
a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
index be359544e4..48bc181f85 100644
--- a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
+++ b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
@@ -413,6 +413,16 @@ public final class PropertyDescriptor implements
Comparable
return this;
}
+/**
+ * Clears all Allowable Values from this Property
+ *
+ * @return the builder
+ */
+public Builder clearAllowableValues() {
+this.allowableValues = null;
+return this;
+}
+
/**
* Sets the Allowable Values for this Property
*
@@ -455,6 +465,16 @@ public final class PropertyDescriptor implements
Comparable
return this;
}
+/**
+ * Clear all Validators from this Property
+ *
+ * @return the builder
+ */
+public Builder clearValidators() {
+validators.clear();
+return this;
+}
+
/**
* Specifies that this property provides the identifier of a Controller
* Service that implements the given interface
@@ -607,6 +627,16 @@ public final class PropertyDescriptor implements
Comparable
return dependsOn(property, dependentValues);
}
+/**
+ * Clear all Dependencies from this Property
+ *
+ * @return the builder
+ */
+public Builder clearDependsOn() {
+this.dependencies = new HashSet<>();
+return this;
+}
+
private AllowableValue toAllowableValue(DescribedValue describedValue)
{
return new AllowableValue(describedValue.getValue(),
describedValue.getDisplayName(), describedValue.getDescription());
}
diff --git
a/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
b/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
index 7eeac9a61a..8e20a82e52 100644
---
a/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
+++
b/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
@@ -35,6 +35,7 @@ import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.anyString;
@@ -188,4 +189,36 @@ public class TestPropertyDescriptor {
// Test the literal value 'target'
assertTrue(withElNotAllowed.validate("target",
validationContext).isValid());
}
+
+@Test
+void testClearingValues() {
+final PropertyDescriptor dep1 = new PropertyDescriptor.Builder()
+.name("dep1")
+.allowableValues("delVal1")
+.build();
+
+final PropertyDescriptor pd1 = new PropertyDescriptor.Builder()
+.name("test")
+.addValidator(Validator.VALID)
+.allowableValues("val1")
+.dependsOn(dep1, "depVal1")
+.build();
+
+final PropertyDescriptor pd2 = new PropertyDescriptor.Builder()
+.fromPropertyDescriptor(pd1)
+.clearValidators()
+.clearAllowableValues()
+.clearDependsOn()
+.build();
+
+assertEquals("test", pd1.getName());
+assertFalse(pd1.getValidators().isEmpty());
+assertFalse(pd1.getDependencies().isEmpty());
+assertNotNull(pd1.getAllowableValues());
+
+assertEq
[nifi] 03/03: NIFI-12211: This closes #7868. add Validator.VALID to username/password on TinkerpopClientService
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 1a0f509ffc4a2d0b9620d1d322807d3588deb6e4 Author: levilentz AuthorDate: Wed Oct 11 10:36:44 2023 -0700 NIFI-12211: This closes #7868. add Validator.VALID to username/password on TinkerpopClientService Signed-off-by: Joseph Witt --- .../src/main/java/org/apache/nifi/graph/TinkerpopClientService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java index f94a5ba0c5..ac01bb7a3a 100644 --- a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java +++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java @@ -167,6 +167,7 @@ public class TinkerpopClientService extends AbstractControllerService implements " Note: when using a remote.yaml file, this username value (if set) will overload any " + "username set in the YAML file.") .required(false) +.addValidator(Validator.VALID) .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) .build(); @@ -178,6 +179,7 @@ public class TinkerpopClientService extends AbstractControllerService implements "password set in the YAML file") .required(false) .sensitive(true) +.addValidator(Validator.VALID) .build(); public static final PropertyDescriptor EXTRA_RESOURCE = new PropertyDescriptor.Builder()
[nifi] 01/03: NIFI-12213 This closes #7871. add nifi-utils dependency to NARs that do not use nifi-standard-services-api-nar as a parent
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 f2927525f30934c9566b0d0b400b268cac0e9297 Author: Mike Moser AuthorDate: Wed Oct 11 20:38:46 2023 + NIFI-12213 This closes #7871. add nifi-utils dependency to NARs that do not use nifi-standard-services-api-nar as a parent Signed-off-by: Joseph Witt --- .../nifi-kerberos-iaa-providers-nar/pom.xml | 5 + .../nifi-ldap-iaa-providers-nar/pom.xml | 5 + 2 files changed, 10 insertions(+) diff --git a/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers-nar/pom.xml b/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers-nar/pom.xml index 1faa60f814..4e3519dadc 100644 --- a/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers-nar/pom.xml +++ b/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers-nar/pom.xml @@ -37,6 +37,11 @@ nifi-security-utils-api compile + +org.apache.nifi +nifi-utils +compile + nifi-kerberos-iaa-providers-nar \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers-nar/pom.xml b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers-nar/pom.xml index 0180c97403..44c47bfdb9 100644 --- a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers-nar/pom.xml +++ b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers-nar/pom.xml @@ -37,6 +37,11 @@ nifi-security-utils-api compile + +org.apache.nifi +nifi-utils +compile + nifi-ldap-iaa-providers-nar \ No newline at end of file
[nifi] branch main updated (9627c4c0e8 -> 1a0f509ffc)
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 9627c4c0e8 NIFI-12174 Upgraded AWS PutLambda Processor to SDK 2 new f2927525f3 NIFI-12213 This closes #7871. add nifi-utils dependency to NARs that do not use nifi-standard-services-api-nar as a parent new 584b3fc165 NIFI-12214 This closes #7869. ConsumeElasticsearch Query Builder properties do not dependOn the Query Definition Style new 1a0f509ffc NIFI-12211: This closes #7868. add Validator.VALID to username/password on TinkerpopClientService The 3 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: .../apache/nifi/components/PropertyDescriptor.java | 30 .../nifi/components/TestPropertyDescriptor.java| 33 ++ .../elasticsearch/ConsumeElasticsearch.java| 32 + .../elasticsearch/ConsumeElasticsearchTest.java| 8 +++--- .../integration/AbstractElasticsearchITBase.java | 2 +- nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml | 4 +-- .../apache/nifi/graph/TinkerpopClientService.java | 2 ++ .../nifi-kerberos-iaa-providers-nar/pom.xml| 5 .../nifi-ldap-iaa-providers-nar/pom.xml| 5 9 files changed, 114 insertions(+), 7 deletions(-)
[nifi] branch main updated: NIFI-12137: This closes #7808. Fixed name of Expression Language Scope from LIMITED to ENVIRONMENT, ; fixed issue in which flowfiles routed to failure by FlowFileTransform
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
The following commit(s) were added to refs/heads/main by this push:
new 711f2f1188 NIFI-12137: This closes #7808. Fixed name of Expression
Language Scope from LIMITED to ENVIRONMENT, ; fixed issue in which flowfiles
routed to failure by FlowFileTransform were also being routed to original;
defined 'identifier' and 'logger' as member variables for FlowFileTransform and
RecordTransform so that IDEs know about them
711f2f1188 is described below
commit 711f2f11888b9ea9eace8816758ad1d0d2075aa5
Author: Mark Payne
AuthorDate: Thu Sep 28 10:09:10 2023 -0400
NIFI-12137: This closes #7808. Fixed name of Expression Language Scope from
LIMITED to ENVIRONMENT, ; fixed issue in which flowfiles routed to failure by
FlowFileTransform were also being routed to original; defined 'identifier' and
'logger' as member variables for FlowFileTransform and RecordTransform so that
IDEs know about them
Signed-off-by: Joseph Witt
---
.../apache/nifi/groups/StandardProcessGroup.java | 5 +
.../python/processor/FlowFileTransformProxy.java | 12 +++
.../python/processor/PythonProcessorProxy.java | 19 +-
.../python/processor/RecordTransformProxy.java | 23 +++---
.../main/python/src/nifiapi/flowfiletransform.py | 4
.../src/main/python/src/nifiapi/properties.py | 7 ---
.../src/main/python/src/nifiapi/recordtransform.py | 4
7 files changed, 45 insertions(+), 29 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
index c56a779e9e..a5d0d388ed 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
@@ -1236,6 +1236,11 @@ public final class StandardProcessGroup implements
ProcessGroup {
conn.verifyCanDelete();
}
+// Avoid performing any more validation on the processor, as it is
no longer necessary and may
+// cause issues with Python-based Processor, as validation may
trigger, attempting to communicate
+// with the Python process even after the Python process has been
destroyed.
+processor.pauseValidationTrigger();
+
try (final NarCloseable x =
NarCloseable.withComponentNarLoader(extensionManager,
processor.getProcessor().getClass(), processor.getIdentifier())) {
final StandardProcessContext processContext = new
StandardProcessContext(processor, controllerServiceProvider,
getStateManager(processor.getIdentifier()), () -> false,
nodeTypeProvider);
diff --git
a/nifi-nar-bundles/nifi-py4j-bundle/nifi-py4j-bridge/src/main/java/org/apache/nifi/python/processor/FlowFileTransformProxy.java
b/nifi-nar-bundles/nifi-py4j-bundle/nifi-py4j-bridge/src/main/java/org/apache/nifi/python/processor/FlowFileTransformProxy.java
index 50bc4ae70d..8ebf00eb19 100644
---
a/nifi-nar-bundles/nifi-py4j-bundle/nifi-py4j-bridge/src/main/java/org/apache/nifi/python/processor/FlowFileTransformProxy.java
+++
b/nifi-nar-bundles/nifi-py4j-bundle/nifi-py4j-bridge/src/main/java/org/apache/nifi/python/processor/FlowFileTransformProxy.java
@@ -17,6 +17,7 @@
package org.apache.nifi.python.processor;
+import java.util.Map;
import org.apache.nifi.annotation.behavior.DefaultRunDuration;
import org.apache.nifi.annotation.behavior.SupportsBatching;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
@@ -27,8 +28,6 @@ import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.exception.ProcessException;
import py4j.Py4JNetworkException;
-import java.util.Map;
-
@SupportsBatching(defaultDuration = DefaultRunDuration.TWENTY_FIVE_MILLIS)
public class FlowFileTransformProxy extends PythonProcessorProxy {
@@ -76,6 +75,13 @@ public class FlowFileTransformProxy extends
PythonProcessorProxy {
session.transfer(original, REL_FAILURE);
return;
}
+final String relationshipName = result.getRelationship();
+final Relationship relationship = new
Relationship.Builder().name(relationshipName).build();
+if (REL_FAILURE.getName().equals(relationshipName)) {
+session.remove(transformed);
+session.transfer(original, REL_FAILURE);
+return;
+}
final Map attributes = result.getAttributes();
if (attributes != n
[nifi] branch main updated: NIFI-12161: This closes #7829. Ensuring framework threads use lightweight threads instead of a capped thread pool. This prevents framework threads from livelocking in the
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
The following commit(s) were added to refs/heads/main by this push:
new 1d9ccb3857 NIFI-12161: This closes #7829. Ensuring framework threads
use lightweight threads instead of a capped thread pool. This prevents
framework threads from livelocking in the event enough framework threads are
holding threads while those needing to run cannot get them.
1d9ccb3857 is described below
commit 1d9ccb3857901faaf531645ae1b09547a0944050
Author: Mark Payne
AuthorDate: Mon Oct 2 11:12:10 2023 -0400
NIFI-12161: This closes #7829. Ensuring framework threads use lightweight
threads instead of a capped thread pool. This prevents framework threads from
livelocking in the event enough framework threads are holding threads while
those needing to run cannot get them.
Signed-off-by: Joseph Witt
---
.../scheduling/StandardProcessScheduler.java | 75 --
.../apache/nifi/tests/system/NiFiClientUtil.java | 56 +---
.../org/apache/nifi/tests/system/NiFiSystemIT.java | 22 +--
.../SpawnedStandaloneNiFiInstanceFactory.java | 7 ++
.../system/pg/SingleFlowFileConcurrencyIT.java | 16 -
5 files changed, 142 insertions(+), 34 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
index ef68c3d67b..f0175d1b7c 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
@@ -73,6 +73,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Supplier;
import static java.util.Objects.requireNonNull;
@@ -90,11 +91,12 @@ public final class StandardProcessScheduler implements
ProcessScheduler {
private final StateManagerProvider stateManagerProvider;
private final long processorStartTimeoutMillis;
private final LifecycleStateManager lifecycleStateManager;
+private final AtomicLong frameworkTaskThreadIndex = new AtomicLong(1L);
-private final ScheduledExecutorService frameworkTaskExecutor;
private final ConcurrentMap
strategyAgentMap = new ConcurrentHashMap<>();
// thread pool for starting/stopping components
+private volatile boolean shutdown = false;
private final ScheduledExecutorService componentLifeCycleThreadPool;
private final ScheduledExecutorService componentMonitoringThreadPool = new
FlowEngine(2, "Monitor Processor Lifecycle", true);
@@ -111,8 +113,6 @@ public final class StandardProcessScheduler implements
ProcessScheduler {
final String timeoutString =
nifiProperties.getProperty(NiFiProperties.PROCESSOR_SCHEDULING_TIMEOUT);
processorStartTimeoutMillis = timeoutString == null ? 6 :
FormatUtils.getTimeDuration(timeoutString.trim(), TimeUnit.MILLISECONDS);
-
-frameworkTaskExecutor = new FlowEngine(4, "Framework Task Thread");
}
public ControllerServiceProvider getControllerServiceProvider() {
@@ -123,20 +123,36 @@ public final class StandardProcessScheduler implements
ProcessScheduler {
return stateManagerProvider.getStateManager(componentId);
}
-public void scheduleFrameworkTask(final Runnable command, final String
taskName, final long initialDelay, final long delay, final TimeUnit timeUnit) {
-frameworkTaskExecutor.scheduleWithFixedDelay(new Runnable() {
-@Override
-public void run() {
-try {
-command.run();
-} catch (final Throwable t) {
-LOG.error("Failed to run Framework Task {} due to {}",
taskName, t.toString());
-if (LOG.isDebugEnabled()) {
-LOG.error("", t);
-}
-}
+public void scheduleFrameworkTask(final Runnable task, final String
taskName, final long initialDelay, final long delay, final TimeUnit timeUnit) {
+Thread.ofVirtual()
+.name(taskName)
+.start(() -> invokeRepeatedly(task, taskName, initialDelay, delay,
timeUnit));
+}
+
+private void invokeRepeatedly(final Runnable task, final String taskName,
final long initia
[nifi] branch support/nifi-1.x updated: NIFI-12163 This closes #7835. Improved Syslog 5424 Line Handling
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 9bd7b91514 NIFI-12163 This closes #7835. Improved Syslog 5424 Line
Handling
9bd7b91514 is described below
commit 9bd7b91514d066ee997b79fc70af367719c0a348
Author: exceptionfactory
AuthorDate: Tue Oct 3 15:26:09 2023 -0500
NIFI-12163 This closes #7835. Improved Syslog 5424 Line Handling
- Eliminated unused parseEvent method signatures from
StrictSyslog5424Parser in favor of a single String line method
- Eliminated intermediate conversion from String to byte array and back to
String for Syslog Parser
Signed-off-by: Joseph Witt
---
.../syslog/parsers/StrictSyslog5424Parser.java | 83 +++
.../syslog/BaseStrictSyslog5424ParserTest.java | 93 ++
.../nifi/processors/standard/ParseSyslog5424.java | 26 ++
.../org/apache/nifi/syslog/Syslog5424Reader.java | 16 ++--
.../apache/nifi/syslog/Syslog5424RecordReader.java | 18 ++---
.../nifi/syslog/TestSyslog5424RecordReader.java| 44 +-
6 files changed, 61 insertions(+), 219 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/src/main/java/org/apache/nifi/syslog/parsers/StrictSyslog5424Parser.java
b/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/src/main/java/org/apache/nifi/syslog/parsers/StrictSyslog5424Parser.java
index ed36c9d34f..d2abe2d972 100644
---
a/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/src/main/java/org/apache/nifi/syslog/parsers/StrictSyslog5424Parser.java
+++
b/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/src/main/java/org/apache/nifi/syslog/parsers/StrictSyslog5424Parser.java
@@ -21,29 +21,18 @@ import com.github.palindromicity.syslog.NilPolicy;
import com.github.palindromicity.syslog.StructuredDataPolicy;
import com.github.palindromicity.syslog.SyslogParserBuilder;
import org.apache.nifi.syslog.events.Syslog5424Event;
-import org.apache.nifi.syslog.keyproviders.SyslogPrefixedKeyProvider;
import org.apache.nifi.syslog.utils.NifiStructuredDataPolicy;
import org.apache.nifi.syslog.utils.NilHandlingPolicy;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-
/**
* Parses a Syslog message from a ByteBuffer into a Syslog5424Event instance.
* For 5424 we use simple-syslog-5424 since it parsers out structured data.
*/
public class StrictSyslog5424Parser {
-private Charset charset;
-private com.github.palindromicity.syslog.SyslogParser parser;
-
-public StrictSyslog5424Parser() {
-this(StandardCharsets.UTF_8, NilHandlingPolicy.NULL,
NifiStructuredDataPolicy.FLATTEN, new SyslogPrefixedKeyProvider());
-}
+private final com.github.palindromicity.syslog.SyslogParser parser;
-public StrictSyslog5424Parser(final Charset charset, final
NilHandlingPolicy nilPolicy,
- NifiStructuredDataPolicy
structuredDataPolicy, KeyProvider keyProvider) {
-this.charset = charset;
+public StrictSyslog5424Parser(final NilHandlingPolicy nilPolicy,
+ final NifiStructuredDataPolicy
structuredDataPolicy, final KeyProvider keyProvider) {
parser = new SyslogParserBuilder()
.withNilPolicy(NilPolicy.valueOf(nilPolicy.name()))
.withStructuredDataPolicy(StructuredDataPolicy.valueOf(structuredDataPolicy.name()))
@@ -52,54 +41,17 @@ public class StrictSyslog5424Parser {
}
/**
- * Parses a Syslog5424Event from a {@code ByteBuffer}.
- *
- * @param buffer a {@code ByteBuffer} containing a syslog message
- * @return a Syslog5424Event parsed from the {@code {@code byte array}}
- */
-public Syslog5424Event parseEvent(final ByteBuffer buffer) {
-return parseEvent(buffer, null);
-}
-
-/**
- * Parses a Syslog5424Event from a {@code ByteBuffer}.
- *
- * @param buffer a {@code ByteBuffer} containing a syslog message
- * @param sender the hostname of the syslog server that sent the message
- * @return a Syslog5424Event parsed from the {@code byte array}
- */
-public Syslog5424Event parseEvent(final ByteBuffer buffer, final String
sender) {
-if (buffer == null) {
-return null;
-}
-return parseEvent(bufferToBytes(buffer), sender);
-}
-
-/**
- * Parses a Syslog5424Event from a {@code byte array}.
+ * Parses a Syslog5424Event from a String
*
- * @param bytes a {@code byte array} containing a syslog message
- * @param sender the hostname of the syslog server that sent the message
- * @return a Syslog5424Event parsed from the {@code byte array}
+ * @param line a {@code String} containing a syslog message
[nifi] branch main updated: NIFI-12163 This closes #7835. Improved Syslog 5424 Line Handling
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
The following commit(s) were added to refs/heads/main by this push:
new da4c6f6e25 NIFI-12163 This closes #7835. Improved Syslog 5424 Line
Handling
da4c6f6e25 is described below
commit da4c6f6e253ad0a490f60554ea57c204927432a2
Author: exceptionfactory
AuthorDate: Tue Oct 3 15:26:09 2023 -0500
NIFI-12163 This closes #7835. Improved Syslog 5424 Line Handling
- Eliminated unused parseEvent method signatures from
StrictSyslog5424Parser in favor of a single String line method
- Eliminated intermediate conversion from String to byte array and back to
String for Syslog Parser
Signed-off-by: Joseph Witt
---
.../syslog/parsers/StrictSyslog5424Parser.java | 83 +++
.../syslog/BaseStrictSyslog5424ParserTest.java | 93 ++
.../nifi/processors/standard/ParseSyslog5424.java | 26 ++
.../org/apache/nifi/syslog/Syslog5424Reader.java | 16 ++--
.../apache/nifi/syslog/Syslog5424RecordReader.java | 18 ++---
.../nifi/syslog/TestSyslog5424RecordReader.java| 44 +-
6 files changed, 61 insertions(+), 219 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/src/main/java/org/apache/nifi/syslog/parsers/StrictSyslog5424Parser.java
b/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/src/main/java/org/apache/nifi/syslog/parsers/StrictSyslog5424Parser.java
index ed36c9d34f..d2abe2d972 100644
---
a/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/src/main/java/org/apache/nifi/syslog/parsers/StrictSyslog5424Parser.java
+++
b/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/src/main/java/org/apache/nifi/syslog/parsers/StrictSyslog5424Parser.java
@@ -21,29 +21,18 @@ import com.github.palindromicity.syslog.NilPolicy;
import com.github.palindromicity.syslog.StructuredDataPolicy;
import com.github.palindromicity.syslog.SyslogParserBuilder;
import org.apache.nifi.syslog.events.Syslog5424Event;
-import org.apache.nifi.syslog.keyproviders.SyslogPrefixedKeyProvider;
import org.apache.nifi.syslog.utils.NifiStructuredDataPolicy;
import org.apache.nifi.syslog.utils.NilHandlingPolicy;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-
/**
* Parses a Syslog message from a ByteBuffer into a Syslog5424Event instance.
* For 5424 we use simple-syslog-5424 since it parsers out structured data.
*/
public class StrictSyslog5424Parser {
-private Charset charset;
-private com.github.palindromicity.syslog.SyslogParser parser;
-
-public StrictSyslog5424Parser() {
-this(StandardCharsets.UTF_8, NilHandlingPolicy.NULL,
NifiStructuredDataPolicy.FLATTEN, new SyslogPrefixedKeyProvider());
-}
+private final com.github.palindromicity.syslog.SyslogParser parser;
-public StrictSyslog5424Parser(final Charset charset, final
NilHandlingPolicy nilPolicy,
- NifiStructuredDataPolicy
structuredDataPolicy, KeyProvider keyProvider) {
-this.charset = charset;
+public StrictSyslog5424Parser(final NilHandlingPolicy nilPolicy,
+ final NifiStructuredDataPolicy
structuredDataPolicy, final KeyProvider keyProvider) {
parser = new SyslogParserBuilder()
.withNilPolicy(NilPolicy.valueOf(nilPolicy.name()))
.withStructuredDataPolicy(StructuredDataPolicy.valueOf(structuredDataPolicy.name()))
@@ -52,54 +41,17 @@ public class StrictSyslog5424Parser {
}
/**
- * Parses a Syslog5424Event from a {@code ByteBuffer}.
- *
- * @param buffer a {@code ByteBuffer} containing a syslog message
- * @return a Syslog5424Event parsed from the {@code {@code byte array}}
- */
-public Syslog5424Event parseEvent(final ByteBuffer buffer) {
-return parseEvent(buffer, null);
-}
-
-/**
- * Parses a Syslog5424Event from a {@code ByteBuffer}.
- *
- * @param buffer a {@code ByteBuffer} containing a syslog message
- * @param sender the hostname of the syslog server that sent the message
- * @return a Syslog5424Event parsed from the {@code byte array}
- */
-public Syslog5424Event parseEvent(final ByteBuffer buffer, final String
sender) {
-if (buffer == null) {
-return null;
-}
-return parseEvent(bufferToBytes(buffer), sender);
-}
-
-/**
- * Parses a Syslog5424Event from a {@code byte array}.
+ * Parses a Syslog5424Event from a String
*
- * @param bytes a {@code byte array} containing a syslog message
- * @param sender the hostname of the syslog server that sent the message
- * @return a Syslog5424Event parsed from the {@code byte array}
+ * @param line a {@code String} containing a syslog message
+ * @return
[nifi] branch support/nifi-1.x updated: NIFI-12162 This closes #7831. Upgraded Netty from 4.1.98 to 4.1.99
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 71baa2c4ce NIFI-12162 This closes #7831. Upgraded Netty from 4.1.98 to 4.1.99 71baa2c4ce is described below commit 71baa2c4ce115a9df2788a6be98ac9d770905225 Author: exceptionfactory AuthorDate: Mon Oct 2 16:52:22 2023 -0500 NIFI-12162 This closes #7831. Upgraded Netty from 4.1.98 to 4.1.99 Signed-off-by: Joseph Witt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c5507c4ab..fb5cdb1dfc 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ 1.3.11 3.10.6.Final 2.2 -4.1.98.Final +4.1.99.Final 5.3.30 5.8.7 1.6.11
[nifi] branch main updated: NIFI-12162 This closes #7831. Upgraded Netty from 4.1.98 to 4.1.99
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 The following commit(s) were added to refs/heads/main by this push: new 2c79b5f8e2 NIFI-12162 This closes #7831. Upgraded Netty from 4.1.98 to 4.1.99 2c79b5f8e2 is described below commit 2c79b5f8e2bbbfadb5defc623b6c95bc1a26343e Author: exceptionfactory AuthorDate: Mon Oct 2 16:52:22 2023 -0500 NIFI-12162 This closes #7831. Upgraded Netty from 4.1.98 to 4.1.99 Signed-off-by: Joseph Witt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3cce6d87fb..30fb7f391e 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ 5.5.0 3.10.6.Final 2.2 -4.1.98.Final +4.1.99.Final 5.3.30 5.8.7 1.6.11
[nifi] branch main updated: NIFI-12157 This closes #7826. Removed nifi-logging-utils and NiFiLog - Replaced NiFiLog references with direct references to SLF4J LoggerFactory
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
The following commit(s) were added to refs/heads/main by this push:
new 19b4be40aa NIFI-12157 This closes #7826. Removed nifi-logging-utils
and NiFiLog - Replaced NiFiLog references with direct references to SLF4J
LoggerFactory
19b4be40aa is described below
commit 19b4be40aa84b01eed4437658ccfab6b4d32ce51
Author: exceptionfactory
AuthorDate: Sat Sep 30 20:26:40 2023 -0500
NIFI-12157 This closes #7826. Removed nifi-logging-utils and NiFiLog
- Replaced NiFiLog references with direct references to SLF4J LoggerFactory
Signed-off-by: Joseph Witt
---
minifi/pom.xml | 5 -
nifi-commons/nifi-logging-utils/pom.xml| 31 --
.../main/java/org/apache/nifi/logging/NiFiLog.java | 366 -
nifi-commons/nifi-socket-utils/pom.xml | 5 -
.../org/apache/nifi/io/socket/SocketUtils.java | 7 +-
nifi-commons/pom.xml | 1 -
.../nifi-framework-cluster-protocol/pom.xml| 5 -
.../nifi-framework/nifi-framework-cluster/pom.xml | 4 -
.../impl/FileBasedClusterNodeFirewall.java | 6 +-
.../nifi-framework/nifi-framework-core/pom.xml | 5 -
.../apache/nifi/web/util/ClientResponseUtils.java | 5 +-
.../web/security/requests/ContentLengthFilter.java | 3 +-
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 5 -
13 files changed, 8 insertions(+), 440 deletions(-)
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 6c3a464aca..8121282e03 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -365,11 +365,6 @@ limitations under the License.
nifi-xml-processing
2.0.0-SNAPSHOT
-
-org.apache.nifi
-nifi-logging-utils
-2.0.0-SNAPSHOT
-
org.apache.nifi
nifi-nar-utils
diff --git a/nifi-commons/nifi-logging-utils/pom.xml
b/nifi-commons/nifi-logging-utils/pom.xml
deleted file mode 100644
index 62b9276879..00
--- a/nifi-commons/nifi-logging-utils/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd;>
-4.0.0
-
-org.apache.nifi
-nifi-commons
-2.0.0-SNAPSHOT
-
-nifi-logging-utils
-Utilities for logging
-
-
-org.slf4j
-slf4j-api
-
-
-
diff --git
a/nifi-commons/nifi-logging-utils/src/main/java/org/apache/nifi/logging/NiFiLog.java
b/nifi-commons/nifi-logging-utils/src/main/java/org/apache/nifi/logging/NiFiLog.java
deleted file mode 100644
index 8f6f1d954f..00
---
a/nifi-commons/nifi-logging-utils/src/main/java/org/apache/nifi/logging/NiFiLog.java
+++ /dev/null
@@ -1,366 +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.
- */
-package org.apache.nifi.logging;
-
-import org.slf4j.Logger;
-import org.slf4j.Marker;
-
-/**
- *
- */
-public class NiFiLog implements Logger {
-
-private final Logger logger;
-
-public NiFiLog(final Logger logger) {
-this.logger = logger;
-}
-
-public Logger getWrappedLog() {
-return logger;
-}
-
-@Override
-public void warn(Marker marker, String string, Throwable thrwbl) {
-if (logger.isDebugEnabled()) {
-logger.warn(marker, string, thrwbl);
-} else {
-logger.warn(marker, string);
-}
-}
-
-@Override
-public void warn(Marker marker, String string, Object... os) {
-logger.warn(marker, string, os);
-}
-
-@Override
-public void warn(Marker marker, String string, Object o, Object o1) {
-logger.warn(marker, string, o, o1);
-}
-
-@Override
-public void warn(Marker marker, String string, Object o) {
-logger.warn(marker, string, o);
-}
-
-@Override
-public void warn(Marker marker, String stri
[nifi] branch main updated (342fb0d876 -> 9228036e1d)
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 342fb0d876 NIFI-12143: This closes #7820. Introduced a new
nifi-calcite-utils module and refactored the nifi-sql-reporting-tasks to mamke
use of it. This uses the newer calcite api instead of deprecated
classes/methods - Refactored QueryRecord / JoinEnrichment to use new
nifi-calcite-utils
new 9b9dd4bae3 NIFI-6721: This closes #7789. jms_expiration attribute
problem fix
new 9228036e1d NIFI-7355: This closes #7677. TinkerpopClientService
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:
.../src/main/resources/META-INF/NOTICE | 8 +-
.../nifi-other-graph-services/pom.xml | 32 +-
.../nifi/graph/AbstractTinkerpopClientService.java | 116 -
.../apache/nifi/graph/GremlinClientService.java| 107 -
.../apache/nifi/graph/TinkerpopClientService.java | 526 +
.../org/apache/nifi/graph/gremlin/SimpleEntry.java | 31 +-
.../org.apache.nifi.controller.ControllerService | 2 +-
.../additionalDetails.html | 54 ---
.../additionalDetails.html | 93
... GremlinClientServiceControllerSettingsIT.java} | 14 +-
...mlinClientServiceYamlSettingsAndBytecodeIT.java | 133 ++
.../nifi/graph/TestableGremlinClientService.java | 8 +-
.../src/test/resources/gremlin.yml | 5 +-
.../apache/nifi/jms/processors/JMSPublisher.java | 23 +-
.../org/apache/nifi/jms/processors/PublishJMS.java | 2 +-
.../jms/processors/JMSPublisherConsumerIT.java | 36 ++
16 files changed, 881 insertions(+), 309 deletions(-)
delete mode 100644
nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/AbstractTinkerpopClientService.java
delete mode 100644
nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/GremlinClientService.java
create mode 100644
nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java
copy
nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DecimalQueryResult.java
=>
nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/gremlin/SimpleEntry.java
(66%)
delete mode 100644
nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/resources/docs/org.apache.nifi.graph.GremlinClientService/additionalDetails.html
create mode 100644
nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/resources/docs/org.apache.nifi.graph.TinkerpopClientService/additionalDetails.html
rename
nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/test/java/org/apache/nifi/graph/{GremlinClientServiceIT.java
=> GremlinClientServiceControllerSettingsIT.java} (84%)
create mode 100644
nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/test/java/org/apache/nifi/graph/GremlinClientServiceYamlSettingsAndBytecodeIT.java
copy minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt =>
nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/test/resources/gremlin.yml
(81%)
[nifi] 02/02: NIFI-7355: This closes #7677. TinkerpopClientService
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 9228036e1db4624b3a90e5a0db607d2673191c59
Author: levilentz
AuthorDate: Sat Sep 23 15:20:20 2023 -0700
NIFI-7355: This closes #7677. TinkerpopClientService
Signed-off-by: Joseph Witt
---
.../src/main/resources/META-INF/NOTICE | 8 +-
.../nifi-other-graph-services/pom.xml | 32 +-
.../nifi/graph/AbstractTinkerpopClientService.java | 116 -
.../apache/nifi/graph/GremlinClientService.java| 107 -
.../apache/nifi/graph/TinkerpopClientService.java | 526 +
.../apache/nifi/graph/gremlin/SimpleEntry.java}| 38 +-
.../org.apache.nifi.controller.ControllerService | 2 +-
.../additionalDetails.html | 54 ---
.../additionalDetails.html | 93
... GremlinClientServiceControllerSettingsIT.java} | 14 +-
...mlinClientServiceYamlSettingsAndBytecodeIT.java | 133 ++
.../nifi/graph/TestableGremlinClientService.java | 8 +-
.../resources/gremlin.yml} | 5 +-
13 files changed, 835 insertions(+), 301 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services-nar/src/main/resources/META-INF/NOTICE
b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services-nar/src/main/resources/META-INF/NOTICE
index 6b3e063ae4..df05408b23 100644
---
a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services-nar/src/main/resources/META-INF/NOTICE
+++
b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services-nar/src/main/resources/META-INF/NOTICE
@@ -108,13 +108,11 @@ The following binary components are provided under the
Apache Software License v
(ASLv2) Exp4j
Copyright 2017
- (ASLv2) Groovy 2.4.16 (http://www.groovy-lang.org)
-groovy-2.4.16-indy
-groovy-json-2.4.16-indy
-groovy-sql-2.4.16-indy
+ (ASLv2) Groovy 4.0.15 (http://www.groovy-lang.org)
+groovy-4.0.15
The following NOTICE information applies:
Apache Groovy
-Copyright 2003-2018 The Apache Software Foundation
+Copyright 2003-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git
a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
index 005b9b8919..8e28435e91 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
@@ -21,6 +21,7 @@
3.7.0
+
org.apache.nifi
@@ -34,7 +35,7 @@
org.apache.nifi
nifi-graph-client-service-api
-${project.version}
+2.0.0-SNAPSHOT
provided
@@ -54,7 +55,6 @@
org.apache.nifi
nifi-mock
-2.0.0-SNAPSHOT
test
@@ -90,6 +90,34 @@
gremlin-driver
${gremlin.version}
+
+
+org.apache.groovy
+groovy
+${nifi.groovy.version}
+
+
+org.apache.groovy
+groovy-dateutil
+${nifi.groovy.version}
+
+
+commons-codec
+commons-codec
+
+
+
+org.testcontainers
+testcontainers
+test
+
+
+
+org.testcontainers
+junit-jupiter
+test
+
+
diff --git
a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/AbstractTinkerpopClientService.java
b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/AbstractTinkerpopClientService.java
deleted file mode 100644
index f85f2f6c4d..00
---
a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/AbstractTinkerpopClientService.java
+++ /dev/null
@@ -1,116 +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
[nifi] 01/02: NIFI-6721: This closes #7789. jms_expiration attribute problem fix
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 9b9dd4bae3be28057ada9fcfeca9f8e3efb79abd
Author: annanys23
AuthorDate: Fri Sep 8 16:25:55 2023 +
NIFI-6721: This closes #7789. jms_expiration attribute problem fix
Originally authored in part by sjyang18
Signed-off-by: Joseph Witt
---
.../apache/nifi/jms/processors/JMSPublisher.java | 23 --
.../org/apache/nifi/jms/processors/PublishJMS.java | 2 +-
.../jms/processors/JMSPublisherConsumerIT.java | 36 ++
3 files changed, 58 insertions(+), 3 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSPublisher.java
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSPublisher.java
index 67a49a9dd6..d5892f013b 100644
---
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSPublisher.java
+++
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSPublisher.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.jms.processors;
+import org.apache.commons.lang3.math.NumberUtils;
import org.apache.nifi.logging.ComponentLog;
import org.springframework.jms.connection.CachingConnectionFactory;
import org.springframework.jms.core.JmsTemplate;
@@ -28,6 +29,7 @@ import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Session;
import javax.jms.TextMessage;
+import java.time.Instant;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -79,8 +81,25 @@ class JMSPublisher extends JMSWorker {
this.jmsTemplate.setDeliveryMode(Integer.parseInt(entry.getValue()));
this.jmsTemplate.setExplicitQosEnabled(true);
} else if (entry.getKey().equals(JmsHeaders.EXPIRATION)) {
-
this.jmsTemplate.setTimeToLive(Integer.parseInt(entry.getValue()));
-this.jmsTemplate.setExplicitQosEnabled(true);
+if(NumberUtils.isCreatable(entry.getValue())) {
//ignore any non-numeric values
+long expiration = Long.parseLong(entry.getValue());
+long ttl = 0L;
+
+// if expiration was set to a positive non-zero
value, then calculate the ttl
+// jmsTemplate does not have an expiration field,
and can only accept a ttl value
+// which is then used to set jms_expiration header
+// ttl is in epoch millis
+if(expiration > 0) {
+ttl = expiration -
Instant.now().toEpochMilli();
+if(ttl > 0) {
+this.jmsTemplate.setTimeToLive(ttl);
+
this.jmsTemplate.setExplicitQosEnabled(true);
+} // else, use default ttl
+} else if (expiration == 0) { // expiration == 0
means no expiration in jms
+this.jmsTemplate.setTimeToLive(0); //ttl must
be explicitly set to 0 to indicate no expiration
+this.jmsTemplate.setExplicitQosEnabled(true);
+} // else, use default ttl
+}
} else if (entry.getKey().equals(JmsHeaders.PRIORITY)) {
this.jmsTemplate.setPriority(Integer.parseInt(entry.getValue()));
this.jmsTemplate.setExplicitQosEnabled(true);
diff --git
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/PublishJMS.java
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/PublishJMS.java
index 8fea7dd663..1e37f6aea1 100644
---
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/PublishJMS.java
+++
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/PublishJMS.java
@@ -85,7 +85,7 @@ import static
org.apache.nifi.jms.processors.ioconcept.reader.record.ProvenanceE
+ "FlowFile attributes will be added as JMS headers and/or properties
to the outgoing JMS message.")
@ReadsAttributes({
@ReadsAttribute(attribute = JmsHeaders.DELIVERY_MODE, description =
"This attribute becomes the JMSDeliveryMode message header. Must be an
integer."),
-@ReadsAttribute(attribute = JmsHeaders.EXPIRATION, description = "This
attribute becomes the JMSExpiration message header. Must be an integer."),
+@ReadsAttribute(attribute
[nifi] branch main updated: NIFI-12038 This closes #7760. introduce PackageFlowFile processor
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
The following commit(s) were added to refs/heads/main by this push:
new e93586df11 NIFI-12038 This closes #7760. introduce PackageFlowFile
processor
e93586df11 is described below
commit e93586df11dd555d264a6c879cbb13c07ace7cf9
Author: Mike Moser
AuthorDate: Thu Sep 14 19:48:09 2023 +
NIFI-12038 This closes #7760. introduce PackageFlowFile processor
Signed-off-by: Joseph Witt
---
.../org/apache/nifi/util/FlowFilePackagerV3.java | 2 +-
.../apache/nifi/util/TestPackageUnpackageV3.java | 2 +
.../nifi/processors/standard/PackageFlowFile.java | 134
.../services/org.apache.nifi.processor.Processor | 1 +
.../processors/standard/TestPackageFlowFile.java | 139 +
5 files changed, 277 insertions(+), 1 deletion(-)
diff --git
a/nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV3.java
b/nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV3.java
index 181f3e3079..4487ed69fb 100644
---
a/nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV3.java
+++
b/nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV3.java
@@ -37,7 +37,7 @@ public class FlowFilePackagerV3 implements FlowFilePackager {
writeFieldLength(out, attributes.size()); //write out the number
of attributes
for (final Map.Entry entry :
attributes.entrySet()) { //write out each attribute key/value pair
writeString(entry.getKey(), out);
-writeString(entry.getValue(), out);
+writeString(entry.getValue() == null ? "" : entry.getValue(),
out);
}
}
diff --git
a/nifi-commons/nifi-flowfile-packager/src/test/java/org/apache/nifi/util/TestPackageUnpackageV3.java
b/nifi-commons/nifi-flowfile-packager/src/test/java/org/apache/nifi/util/TestPackageUnpackageV3.java
index 1bd8f09821..cd6a1a523d 100644
---
a/nifi-commons/nifi-flowfile-packager/src/test/java/org/apache/nifi/util/TestPackageUnpackageV3.java
+++
b/nifi-commons/nifi-flowfile-packager/src/test/java/org/apache/nifi/util/TestPackageUnpackageV3.java
@@ -38,6 +38,7 @@ public class TestPackageUnpackageV3 {
final byte[] data = "Hello, World!".getBytes(StandardCharsets.UTF_8);
final Map map = new HashMap<>();
map.put("abc", "cba");
+map.put("123", null);
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
final ByteArrayInputStream in = new ByteArrayInputStream(data);
@@ -49,6 +50,7 @@ public class TestPackageUnpackageV3 {
final Map unpackagedAttributes =
unpackager.unpackageFlowFile(encodedIn, decodedOut);
final byte[] decoded = decodedOut.toByteArray();
+map.put("123", ""); // replace null attribute for verification,
because it is packaged as empty string
assertEquals(map, unpackagedAttributes);
assertArrayEquals(data, decoded);
}
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PackageFlowFile.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PackageFlowFile.java
new file mode 100644
index 00..3e589a7104
--- /dev/null
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PackageFlowFile.java
@@ -0,0 +1,134 @@
+/*
+ * 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.
+ */
+package org.apache.nifi.processors.standard;
+
+import org.apache.nifi.annotation.behavior.InputRequirement;
+import org.apache.nifi.annotation.behavior.SideEffectFree;
+import org.apache.nifi.annotation.behavior.SupportsBatching;
+import org.apache.nifi.annotation.behavior.WritesAttribute;
+import org.apache.nifi.annotation.behavior.W
[nifi] 02/02: NIFI-12152 This closes #7818. Refactored addProvider() Bouncy Castle references
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 c76191fa4b80309ea239aa30d63951188b7fef76
Author: exceptionfactory
AuthorDate: Fri Sep 29 16:13:02 2023 -0500
NIFI-12152 This closes #7818. Refactored addProvider() Bouncy Castle
references
- Removed Security.addProvider() references from several tests
- Refactored KeyStoreUtils to use instance of BouncyCastleProvider instead
of BC provider name string
- Refactored MiNiFi references to pass BouncyCastleProvider for BCFKS
Signed-off-by: Joseph Witt
---
.../ingestors/RestChangeIngestor.java | 36 +-
.../apache/nifi/minifi/c2/jetty/JettyServer.java | 35 -
.../nifi/security/ssl/StandardKeyStoreBuilder.java | 9 ++--
.../apache/nifi/security/util/KeyStoreUtils.java | 57 +-
.../x509/ocsp/OcspCertificateValidatorTest.java| 23 ++---
.../nifi/processors/snowflake/SnowflakePipeIT.java | 8 ---
.../standard/CryptographicHashContentTest.java | 8 ---
.../properties/NiFiRegistryPropertiesLoader.java | 3 --
.../nifi/registry/security/util/KeyStoreUtils.java | 44 ++---
.../registry/security/util/KeyStoreUtilsTest.java | 14 --
.../nifi/properties/ConfigEncryptionTool.groovy| 4 --
.../toolkit/encryptconfig/EncryptConfigMain.groovy | 5 --
.../nifi/toolkit/tls/util/TlsHelperTest.java | 21 +---
13 files changed, 73 insertions(+), 194 deletions(-)
diff --git
a/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/RestChangeIngestor.java
b/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/RestChangeIngestor.java
index a33520e318..b2b648ca2e 100644
---
a/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/RestChangeIngestor.java
+++
b/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/RestChangeIngestor.java
@@ -31,7 +31,6 @@ import java.io.UncheckedIOException;
import java.net.URI;
import java.nio.ByteBuffer;
import java.security.KeyStore;
-import java.security.Security;
import java.util.Collection;
import java.util.Map;
import java.util.Properties;
@@ -48,6 +47,7 @@ import
org.apache.nifi.minifi.bootstrap.configuration.differentiators.WholeConfi
import
org.apache.nifi.minifi.bootstrap.configuration.ingestors.interfaces.ChangeIngestor;
import org.apache.nifi.security.ssl.StandardKeyStoreBuilder;
import org.apache.nifi.security.ssl.StandardSslContextBuilder;
+import org.apache.nifi.security.util.KeystoreType;
import org.apache.nifi.security.util.TlsPlatform;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.eclipse.jetty.server.Request;
@@ -62,10 +62,6 @@ import org.slf4j.LoggerFactory;
public class RestChangeIngestor implements ChangeIngestor {
-static {
-Security.addProvider(new BouncyCastleProvider());
-}
-
public static final String GET_TEXT = "This is a config change listener
for an Apache NiFi - MiNiFi instance.\n" +
"Use this rest server to upload a flow.json to configure the MiNiFi
instance.\n" +
"Send a POST http request to '/' to upload the file.";
@@ -86,6 +82,8 @@ public class RestChangeIngestor implements ChangeIngestor {
private final static Logger logger =
LoggerFactory.getLogger(RestChangeIngestor.class);
+private static final BouncyCastleProvider BOUNCY_CASTLE_PROVIDER = new
BouncyCastleProvider();
+
private static final Map>>
DIFFERENTIATOR_CONSTRUCTOR_MAP = Map.of(
WHOLE_CONFIG_KEY,
WholeConfigDifferentiator::getByteBufferDifferentiator
);
@@ -174,22 +172,34 @@ public class RestChangeIngestor implements ChangeIngestor
{
KeyStore trustStore = null;
try (FileInputStream keyStoreStream = new
FileInputStream(properties.getProperty(KEYSTORE_LOCATION_KEY))) {
-keyStore = new StandardKeyStoreBuilder()
-.type(properties.getProperty(KEYSTORE_TYPE_KEY))
+final String keyStoreType =
properties.getProperty(KEYSTORE_TYPE_KEY);
+final StandardKeyStoreBuilder builder = new
StandardKeyStoreBuilder()
+.type(keyStoreType)
.inputStream(keyStoreStream)
-
.password(properties.getProperty(KEYSTORE_PASSWORD_KEY).toCharArray())
-.build();
+
.password(properties.getProperty(KEYSTORE_PASSWORD_KEY).toCharArray());
+
+if (KeystoreType.BCFKS.getType().equals(keyStoreType)) {
+builder.provider(BOUNCY_CASTLE_PROVIDER);
+}
+
+keyStore = builder.build();
} catch (IOException ioe) {
throw new UncheckedIOException("Key Store loading failed", ioe);
[nifi] branch main updated (9ba81c9564 -> c76191fa4b)
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 9ba81c9564 NIFI-12147 Cleaned poms, updated Dockerfile, fixed Jersey version to get appropriate bundled ASM new 75c3b19979 NIFI-12142 This closes #7822. Corrected Cluster Pool Size Method Reference new c76191fa4b NIFI-12152 This closes #7818. Refactored addProvider() Bouncy Castle references 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: .../ingestors/RestChangeIngestor.java | 36 +- .../apache/nifi/minifi/c2/jetty/JettyServer.java | 35 - .../nifi/security/ssl/StandardKeyStoreBuilder.java | 9 ++-- .../apache/nifi/security/util/KeyStoreUtils.java | 57 +- .../resources/nifi-cluster-protocol-context.xml| 4 +- .../x509/ocsp/OcspCertificateValidatorTest.java| 23 ++--- .../nifi/processors/snowflake/SnowflakePipeIT.java | 8 --- .../standard/CryptographicHashContentTest.java | 8 --- .../properties/NiFiRegistryPropertiesLoader.java | 3 -- .../nifi/registry/security/util/KeyStoreUtils.java | 44 ++--- .../registry/security/util/KeyStoreUtilsTest.java | 14 -- .../nifi/properties/ConfigEncryptionTool.groovy| 4 -- .../toolkit/encryptconfig/EncryptConfigMain.groovy | 5 -- .../nifi/toolkit/tls/util/TlsHelperTest.java | 21 +--- 14 files changed, 75 insertions(+), 196 deletions(-)
[nifi] 01/02: NIFI-12142 This closes #7822. Corrected Cluster Pool Size Method Reference
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 75c3b19979403467b278469af98a4aa1048f0ccc Author: exceptionfactory AuthorDate: Sat Sep 30 08:15:29 2023 -0500 NIFI-12142 This closes #7822. Corrected Cluster Pool Size Method Reference - Set getClusterNodeProtocolMaxPoolSize method reference in place of deprecated getClusterNodeProtocolThreads Signed-off-by: Joseph Witt --- .../src/main/resources/nifi-cluster-protocol-context.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/resources/nifi-cluster-protocol-context.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/resources/nifi-cluster-protocol-context.xml index e69a06e8dc..ab45e52501 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/resources/nifi-cluster-protocol-context.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/resources/nifi-cluster-protocol-context.xml @@ -43,7 +43,7 @@ - + @@ -73,7 +73,7 @@ - +
[nifi] branch main updated: NIFI-12141 This closes #7805. Update README about HTTPS and OpenID Authentication for Docker Image
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 The following commit(s) were added to refs/heads/main by this push: new b8fd22e065 NIFI-12141 This closes #7805. Update README about HTTPS and OpenID Authentication for Docker Image b8fd22e065 is described below commit b8fd22e0659549f89db831460c1312686fb51b95 Author: Marcelo VinÃcius de Sousa Campos AuthorDate: Thu Sep 28 09:52:22 2023 -0300 NIFI-12141 This closes #7805. Update README about HTTPS and OpenID Authentication for Docker Image According to this recent issue [NIFI-12135](https://issues.apache.org/jira/browse/NIFI-12135) I've forgotten to add 2 missing environment variables about OIDC configurations for docker image: - NIFI_SECURITY_USER_OIDC_CLAIM_GROUPS and - NIFI_SECURITY_USER_OIDC_TOKEN_REFRESH_WINDOW Signed-off-by: Joseph Witt --- nifi-docker/dockerhub/README.md | 24 +--- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/nifi-docker/dockerhub/README.md b/nifi-docker/dockerhub/README.md index 422e6dcf13..a3e8388ae5 100644 --- a/nifi-docker/dockerhub/README.md +++ b/nifi-docker/dockerhub/README.md @@ -188,7 +188,7 @@ user with administrative privileges. ### For a minimal, connection to an OpenID server docker run --name nifi \ - -v /User/dreynolds/certs/localhost:/opt/certs \ + -v $(pwd)/certs/localhost:/opt/certs \ -p 8443:8443 \ -e AUTH=oidc \ -e KEYSTORE_PATH=/opt/certs/keystore.jks \ @@ -198,16 +198,18 @@ user with administrative privileges. -e TRUSTSTORE_PASSWORD=rHkWR1gDNW3R9hgbeRsT3OM3Ue0zwGtQqcFKJD2EXWE \ -e TRUSTSTORE_TYPE=JKS \ -e INITIAL_ADMIN_IDENTITY='test' \ - -e NIFI_SECURITY_USER_OIDC_DISCOVERY_URL: http://OPENID_SERVER_URL/auth/realms/OPENID_REALM/.well-known/openid-configuration \ - -e NIFI_SECURITY_USER_OIDC_CONNECT_TIMEOUT: 1 \ - -e NIFI_SECURITY_USER_OIDC_READ_TIMEOUT: 1 \ - -e NIFI_SECURITY_USER_OIDC_CLIENT_ID: nifi \ - -e NIFI_SECURITY_USER_OIDC_CLIENT_SECRET: tU47ugXO308WZqf5TtylyoMX3xH6W0kN \ - -e NIFI_SECURITY_USER_OIDC_PREFERRED_JWSALGORITHM: RS256 \ - -e NIFI_SECURITY_USER_OIDC_ADDITIONAL_SCOPES: email \ - -e NIFI_SECURITY_USER_OIDC_CLAIM_IDENTIFYING_USER: preferred_username \ - -e NIFI_SECURITY_USER_OIDC_FALLBACK_CLAIMS_IDENTIFYING_USER: email \ - -e NIFI_SECURITY_USER_OIDC_TRUSTSTORE_STRATEGY: PKIX \ + -e NIFI_SECURITY_USER_OIDC_DISCOVERY_URL=http://OPENID_SERVER_URL/auth/realms/OPENID_REALM/.well-known/openid-configuration \ + -e NIFI_SECURITY_USER_OIDC_CONNECT_TIMEOUT=1 \ + -e NIFI_SECURITY_USER_OIDC_READ_TIMEOUT=1 \ + -e NIFI_SECURITY_USER_OIDC_CLIENT_ID=nifi \ + -e NIFI_SECURITY_USER_OIDC_CLIENT_SECRET=tU47ugXO308WZqf5TtylyoMX3xH6W0kN \ + -e NIFI_SECURITY_USER_OIDC_PREFERRED_JWSALGORITHM=RS256 \ + -e NIFI_SECURITY_USER_OIDC_ADDITIONAL_SCOPES=email \ + -e NIFI_SECURITY_USER_OIDC_CLAIM_IDENTIFYING_USER=preferred_username \ + -e NIFI_SECURITY_USER_OIDC_CLAIM_GROUPS=admin \ + -e NIFI_SECURITY_USER_OIDC_FALLBACK_CLAIMS_IDENTIFYING_USER=email \ + -e NIFI_SECURITY_USER_OIDC_TRUSTSTORE_STRATEGY=PKIX \ + -e NIFI_SECURITY_USER_OIDC_TOKEN_REFRESH_WINDOW='60 secs' \ -d \ apache/nifi:latest
[nifi] branch main updated: NIFI-12135 This closes #7799. Update update_oidc_properties.sh
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
The following commit(s) were added to refs/heads/main by this push:
new acd9b5b10b NIFI-12135 This closes #7799. Update
update_oidc_properties.sh
acd9b5b10b is described below
commit acd9b5b10b67096b8981e49299a165ff1afea0ff
Author: Marcelo VinÃcius de Sousa Campos
AuthorDate: Wed Sep 27 08:23:49 2023 -0300
NIFI-12135 This closes #7799. Update update_oidc_properties.sh
Update OIDC properties via update_oidc_properties.sh
Signed-off-by: Joseph Witt
---
nifi-docker/dockerhub/sh/update_oidc_properties.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/nifi-docker/dockerhub/sh/update_oidc_properties.sh
b/nifi-docker/dockerhub/sh/update_oidc_properties.sh
index 827a40edba..2367b365d2 100644
--- a/nifi-docker/dockerhub/sh/update_oidc_properties.sh
+++ b/nifi-docker/dockerhub/sh/update_oidc_properties.sh
@@ -23,5 +23,7 @@ prop_replace 'nifi.security.user.oidc.client.secret'
"${NIFI_
prop_replace 'nifi.security.user.oidc.preferred.jwsalgorithm'
"${NIFI_SECURITY_USER_OIDC_PREFERRED_JWSALGORITHM}"
prop_replace 'nifi.security.user.oidc.additional.scopes'
"${NIFI_SECURITY_USER_OIDC_ADDITIONAL_SCOPES}"
prop_replace 'nifi.security.user.oidc.claim.identifying.user'
"${NIFI_SECURITY_USER_OIDC_CLAIM_IDENTIFYING_USER}"
+prop_replace 'nifi.security.user.oidc.claim.groups'
"${NIFI_SECURITY_USER_OIDC_CLAIM_GROUPS}"
prop_replace 'nifi.security.user.oidc.fallback.claims.identifying.user'
"${NIFI_SECURITY_USER_OIDC_FALLBACK_CLAIMS_IDENTIFYING_USER}"
prop_replace 'nifi.security.user.oidc.truststore.strategy'
"${NIFI_SECURITY_USER_OIDC_TRUSTSTORE_STRATEGY}"
+prop_replace 'nifi.security.user.oidc.token.refresh.window'
"${NIFI_SECURITY_USER_OIDC_TOKEN_REFRESH_WINDOW}"
[nifi] branch main updated: NIFI-12136 This closes #7800. Update README.md to add an example how to using Nifi to connect to an OpenID server.
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 The following commit(s) were added to refs/heads/main by this push: new 01fb3e99dd NIFI-12136 This closes #7800. Update README.md to add an example how to using Nifi to connect to an OpenID server. 01fb3e99dd is described below commit 01fb3e99dde95fc4e83c598536263eedf632ef65 Author: Marcelo VinÃcius de Sousa Campos AuthorDate: Wed Sep 27 11:13:07 2023 -0300 NIFI-12136 This closes #7800. Update README.md to add an example how to using Nifi to connect to an OpenID server. Signed-off-by: Joseph Witt --- nifi-docker/dockerhub/README.md | 35 +++ 1 file changed, 35 insertions(+) diff --git a/nifi-docker/dockerhub/README.md b/nifi-docker/dockerhub/README.md index f7113a0340..422e6dcf13 100644 --- a/nifi-docker/dockerhub/README.md +++ b/nifi-docker/dockerhub/README.md @@ -179,6 +179,41 @@ volume to provide certificates on the host system to the container instance. -e LDAP_TLS_TRUSTSTORE_PASSWORD: '' -e LDAP_TLS_TRUSTSTORE_TYPE: '' +### Standalone Instance secured with HTTPS and OpenID Authentication +In this configuration, the user will need to provide certificates and associated configuration information. +Of particular note, is the `AUTH` environment variable which is set to `oidc`. Additionally, the user must provide a +in the `INITIAL_ADMIN_IDENTITY` environment variable. This value will be used to seed the instance with an initial +user with administrative privileges. + +### For a minimal, connection to an OpenID server + +docker run --name nifi \ + -v /User/dreynolds/certs/localhost:/opt/certs \ + -p 8443:8443 \ + -e AUTH=oidc \ + -e KEYSTORE_PATH=/opt/certs/keystore.jks \ + -e KEYSTORE_TYPE=JKS \ + -e KEYSTORE_PASSWORD=QKZv1hSWAFQYZ+WU1jjF5ank+l4igeOfQRp+OSbkkrs \ + -e TRUSTSTORE_PATH=/opt/certs/truststore.jks \ + -e TRUSTSTORE_PASSWORD=rHkWR1gDNW3R9hgbeRsT3OM3Ue0zwGtQqcFKJD2EXWE \ + -e TRUSTSTORE_TYPE=JKS \ + -e INITIAL_ADMIN_IDENTITY='test' \ + -e NIFI_SECURITY_USER_OIDC_DISCOVERY_URL: http://OPENID_SERVER_URL/auth/realms/OPENID_REALM/.well-known/openid-configuration \ + -e NIFI_SECURITY_USER_OIDC_CONNECT_TIMEOUT: 1 \ + -e NIFI_SECURITY_USER_OIDC_READ_TIMEOUT: 1 \ + -e NIFI_SECURITY_USER_OIDC_CLIENT_ID: nifi \ + -e NIFI_SECURITY_USER_OIDC_CLIENT_SECRET: tU47ugXO308WZqf5TtylyoMX3xH6W0kN \ + -e NIFI_SECURITY_USER_OIDC_PREFERRED_JWSALGORITHM: RS256 \ + -e NIFI_SECURITY_USER_OIDC_ADDITIONAL_SCOPES: email \ + -e NIFI_SECURITY_USER_OIDC_CLAIM_IDENTIFYING_USER: preferred_username \ + -e NIFI_SECURITY_USER_OIDC_FALLBACK_CLAIMS_IDENTIFYING_USER: email \ + -e NIFI_SECURITY_USER_OIDC_TRUSTSTORE_STRATEGY: PKIX \ + -d \ + apache/nifi:latest + +- Make sure you've created realm, client and user in OpenID Server before with the same user name defined in `INITIAL_ADMIN_IDENTITY` environment variable +- You can read more information about theses Nifi security OIDC configurations in this following link: [https://nifi.apache.org/docs/nifi-docs/html/administration-guide.html#openid_connect](https://nifi.apache.org/docs/nifi-docs/html/administration-guide.html#openid_connect) + Clustering can be enabled by using the following properties to Docker environment variable mappings. # nifi.properties
[nifi] branch main updated: NIFI-11271: This closes #7795. Removed deprecated Kerberos-related properties and updated to make use of KerberosUserService; some code cleanup to bring up-to-date with Jav
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
The following commit(s) were added to refs/heads/main by this push:
new 16c527271b NIFI-11271: This closes #7795. Removed deprecated
Kerberos-related properties and updated to make use of KerberosUserService;
some code cleanup to bring up-to-date with Java 21 recommendations such as
Stream.toList() instead of Stream.collect(Collectors.toList()) and using
enhanced switch statements
16c527271b is described below
commit 16c527271bbfc2f83b251383880dcb78972ce7e4
Author: Mark Payne
AuthorDate: Tue Sep 26 11:42:22 2023 -0400
NIFI-11271: This closes #7795. Removed deprecated Kerberos-related
properties and updated to make use of KerberosUserService; some code cleanup to
bring up-to-date with Java 21 recommendations such as Stream.toList() instead
of Stream.collect(Collectors.toList()) and using enhanced switch statements
Signed-off-by: Joseph Witt
---
.../nifi-kudu-controller-service/pom.xml | 11 +-
.../nifi/controller/kudu/KuduLookupService.java| 164 +---
.../processors/kudu/AbstractKuduProcessor.java | 296 +
.../org/apache/nifi/processors/kudu/PutKudu.java | 88 +++---
.../apache/nifi/processors/kudu/MockPutKudu.java | 146 ++
.../apache/nifi/processors/kudu/TestPutKudu.java | 134 ++
6 files changed, 203 insertions(+), 636 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/pom.xml
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/pom.xml
index 1d23041702..36c48656be 100644
--- a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/pom.xml
+++ b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/pom.xml
@@ -63,11 +63,6 @@
2.0.0-SNAPSHOT
provided
-
-org.apache.nifi
-nifi-kerberos-credentials-service-api
-provided
-
org.apache.nifi
nifi-record
@@ -88,6 +83,12 @@
kudu-client
${kudu.version}
+
+org.apache.nifi
+nifi-kerberos-user-service-api
+2.0.0-SNAPSHOT
+provided
+
diff --git
a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/src/main/java/org/apache/nifi/controller/kudu/KuduLookupService.java
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/src/main/java/org/apache/nifi/controller/kudu/KuduLookupService.java
index b208186fac..a53444340d 100644
---
a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/src/main/java/org/apache/nifi/controller/kudu/KuduLookupService.java
+++
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/src/main/java/org/apache/nifi/controller/kudu/KuduLookupService.java
@@ -16,6 +16,18 @@
*/
package org.apache.nifi.controller.kudu;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import javax.security.auth.login.LoginException;
import org.apache.kudu.ColumnSchema;
import org.apache.kudu.ColumnTypeAttributes;
import org.apache.kudu.Schema;
@@ -38,12 +50,11 @@ import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.controller.ControllerServiceInitializationContext;
import org.apache.nifi.expression.ExpressionLanguageScope;
-import org.apache.nifi.kerberos.KerberosCredentialsService;
+import org.apache.nifi.kerberos.KerberosUserService;
import org.apache.nifi.lookup.RecordLookupService;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.security.krb.KerberosAction;
-import org.apache.nifi.security.krb.KerberosKeytabUser;
import org.apache.nifi.security.krb.KerberosUser;
import org.apache.nifi.serialization.SimpleRecordSchema;
import org.apache.nifi.serialization.record.MapRecord;
@@ -52,20 +63,6 @@ import org.apache.nifi.serialization.record.RecordField;
import org.apache.nifi.serialization.record.RecordFieldType;
import org.apache.nifi.serialization.record.RecordSchema;
-import javax.security.auth.login.LoginException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
@CapabilityDescription("Lookup a r
[nifi] branch main updated: NIFI-12123: This closes #7786. Added additional @UseCase and @MultiProcessorUseCase annotations as well as some trivial cleanup that was flagged by IntelliJ such as making
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
The following commit(s) were added to refs/heads/main by this push:
new 025109a9d8 NIFI-12123: This closes #7786. Added additional @UseCase
and @MultiProcessorUseCase annotations as well as some trivial cleanup that was
flagged by IntelliJ such as making inner class static, updating some deprecated
references, etc.
025109a9d8 is described below
commit 025109a9d89b78136e888c69b8fbb817a75ae33e
Author: Mark Payne
AuthorDate: Mon Sep 25 09:04:44 2023 -0400
NIFI-12123: This closes #7786. Added additional @UseCase and
@MultiProcessorUseCase annotations as well as some trivial cleanup that was
flagged by IntelliJ such as making inner class static, updating some deprecated
references, etc.
Signed-off-by: Joseph Witt
---
.../azure/storage/FetchAzureBlobStorage_v12.java | 44 +---
.../azure/storage/FetchAzureDataLakeStorage.java | 42 ++--
.../processors/gcp/drive/FetchGoogleDrive.java | 80 +-
.../processors/gcp/storage/FetchGCSObject.java | 53 ++
.../apache/nifi/processors/standard/FetchFTP.java | 35 +-
.../apache/nifi/processors/standard/FetchSFTP.java | 33 -
.../processors/standard/RemoveRecordField.java | 22 +-
7 files changed, 243 insertions(+), 66 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureBlobStorage_v12.java
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureBlobStorage_v12.java
index 4d9db2d5b1..18ca4a6d0f 100644
---
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureBlobStorage_v12.java
+++
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureBlobStorage_v12.java
@@ -20,11 +20,20 @@ import com.azure.storage.blob.BlobClient;
import com.azure.storage.blob.BlobContainerClient;
import com.azure.storage.blob.BlobServiceClient;
import com.azure.storage.blob.models.BlobRange;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
import org.apache.nifi.annotation.behavior.WritesAttribute;
import org.apache.nifi.annotation.behavior.WritesAttributes;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.MultiProcessorUseCase;
+import org.apache.nifi.annotation.documentation.ProcessorConfiguration;
import org.apache.nifi.annotation.documentation.SeeAlso;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
@@ -40,15 +49,6 @@ import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.processors.azure.AbstractAzureBlobProcessor_v12;
import org.apache.nifi.processors.azure.ClientSideEncryptionSupport;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
import static
org.apache.nifi.processors.azure.storage.utils.BlobAttributes.ATTR_DESCRIPTION_BLOBNAME;
import static
org.apache.nifi.processors.azure.storage.utils.BlobAttributes.ATTR_DESCRIPTION_BLOBTYPE;
import static
org.apache.nifi.processors.azure.storage.utils.BlobAttributes.ATTR_DESCRIPTION_CONTAINER;
@@ -81,6 +81,32 @@ import static
org.apache.nifi.processors.azure.storage.utils.BlobAttributes.ATTR
@WritesAttribute(attribute = ATTR_NAME_LANG, description =
ATTR_DESCRIPTION_LANG),
@WritesAttribute(attribute = ATTR_NAME_TIMESTAMP, description =
ATTR_DESCRIPTION_TIMESTAMP),
@WritesAttribute(attribute = ATTR_NAME_LENGTH, description =
ATTR_DESCRIPTION_LENGTH)})
+@MultiProcessorUseCase(
+description = "Retrieve all files in an Azure Blob Storage container",
+keywords = {"azure", "blob", "storage", "state", "retrieve", "fetch",
"all", "stream"},
+configurations = {
+@ProcessorConfiguration(
+processorClass = ListAzureBlobStorage_v12.class,
+configuration = """
+The "Container Name" property should be set to the name of the
Blob Storage Container that files reside in. \
+If the flo
[nifi] branch main updated: NIFI-12068: This closes #7737. Added the ability to annotate components with @UseCase and @MultiProcessorUseCase annotations; updated several processors to make use of them
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
The following commit(s) were added to refs/heads/main by this push:
new 140ac52e9d NIFI-12068: This closes #7737. Added the ability to
annotate components with @UseCase and @MultiProcessorUseCase annotations;
updated several processors to make use of them.
140ac52e9d is described below
commit 140ac52e9d6434426ec679c5fa7258e0f1fba3c2
Author: Mark Payne
AuthorDate: Fri Sep 15 12:04:10 2023 -0400
NIFI-12068: This closes #7737. Added the ability to annotate components
with @UseCase and @MultiProcessorUseCase annotations; updated several
processors to make use of them.
Signed-off-by: Joseph Witt
---
.../documentation/MultiProcessorUseCase.java | 77 +
.../documentation/MultiProcessorUseCases.java | 36 +++
.../documentation/ProcessorConfiguration.java | 57
.../nifi/annotation/documentation/UseCase.java | 89 ++
.../nifi/annotation/documentation/UseCases.java| 36 +++
.../documentation/AbstractDocumentationWriter.java | 30 +-
.../documentation/xml/XmlDocumentationWriter.java | 59
.../apache/nifi/extension/manifest/Extension.java | 26 ++
.../extension/manifest/MultiProcessorUseCase.java | 75 +
.../extension/manifest/ProcessorConfiguration.java | 43 +++
.../apache/nifi/extension/manifest/UseCase.java| 84 ++
.../nifi/processors/aws/s3/FetchS3Object.java | 88 +-
.../html/HtmlDocumentationWriter.java | 136 +
.../nifi/processors/standard/CompressContent.java | 37 +++
.../nifi/processors/standard/ConvertRecord.java| 6 +
.../nifi/processors/standard/MergeContent.java | 309 -
.../nifi/processors/standard/PartitionRecord.java | 35 ++-
.../processors/standard/PutDatabaseRecord.java | 2 +
.../nifi/processors/standard/QueryRecord.java | 43 ++-
.../nifi/processors/standard/ReplaceText.java | 65 -
.../nifi/processors/standard/RouteOnAttribute.java | 81 +-
.../apache/nifi/processors/standard/RouteText.java | 34 ++-
.../nifi/processors/standard/UpdateRecord.java | 62 -
23 files changed, 1361 insertions(+), 149 deletions(-)
diff --git
a/nifi-api/src/main/java/org/apache/nifi/annotation/documentation/MultiProcessorUseCase.java
b/nifi-api/src/main/java/org/apache/nifi/annotation/documentation/MultiProcessorUseCase.java
new file mode 100644
index 00..562647ea6a
--- /dev/null
+++
b/nifi-api/src/main/java/org/apache/nifi/annotation/documentation/MultiProcessorUseCase.java
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+package org.apache.nifi.annotation.documentation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ *
+ * An annotation that can be used for Processors in order to explain a
specific use case that can be
+ * accomplished using this Processor in conjunction with at least one
other Processor.
+ * For Processors that are able to be used for multiple use cases, the
component
+ * may be annotated with multiple MultiProcessorUseCase annotations.
+ *
+ *
+ * Note that this annotation differs from {@link UseCase} in that UseCase
should describe a use case that is
+ * accomplished using only the extension that is annotated. In contrast,
MultiProcessorUseCase documents a use case
+ * that is accomplished by using both the Processor that is annotated as
well as other Processors.
+ *
+ */
+@Documented
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+@Repeatable(MultiProcessorUseCases.class)
+public @interface MultiProcessorUseCase {
+
+/**
+ * A simple 1 (at most 2) sentence description of the use case. This
should not include any extraneous details, such
+ * as caveats, examples, etc. Those can be provided using the {@li
[nifi] branch support/nifi-1.x updated: NIFI-12111 This closes #7776. Deprecated Unmaintained Components for Removal
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 90972a7f57 NIFI-12111 This closes #7776. Deprecated Unmaintained
Components for Removal
90972a7f57 is described below
commit 90972a7f57a63457753af3fde51583f4c16c47b4
Author: exceptionfactory
AuthorDate: Thu Sep 21 21:27:31 2023 -0500
NIFI-12111 This closes #7776. Deprecated Unmaintained Components for Removal
- nifi-cybersecurity-bundle
- nifi-html-bundle
- nifi-metrics-reporting-bundle
- nifi-riemann-bundle
- nifi-tcp-bundle
- nifi-rules-action-handler-bundle
Signed-off-by: Joseph Witt
---
.../org/apache/nifi/processors/cybersecurity/CompareFuzzyHash.java | 3 ++-
.../org/apache/nifi/processors/cybersecurity/FuzzyHashContent.java | 3 ++-
.../src/main/java/org/apache/nifi/GetHTMLElement.java | 2 ++
.../src/main/java/org/apache/nifi/ModifyHTMLElement.java | 2 ++
.../src/main/java/org/apache/nifi/PutHTMLElement.java | 2 ++
.../reporting/reporter/service/GraphiteMetricReporterService.java | 2 ++
.../org/apache/nifi/metrics/reporting/task/MetricsReportingTask.java | 2 ++
.../src/main/java/org/apache/nifi/processors/riemann/PutRiemann.java | 2 ++
.../main/java/org/apache/nifi/rules/handlers/ActionHandlerLookup.java | 2 ++
.../src/main/java/org/apache/nifi/rules/handlers/AlertHandler.java | 2 ++
.../main/java/org/apache/nifi/rules/handlers/ExpressionHandler.java| 2 ++
.../src/main/java/org/apache/nifi/rules/handlers/LogHandler.java | 2 ++
.../main/java/org/apache/nifi/rules/handlers/RecordSinkHandler.java| 2 ++
.../src/main/java/org/apache/nifi/processors/gettcp/GetTCP.java| 2 ++
14 files changed, 28 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/java/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash.java
b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/java/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash.java
index 0a8ce67c3f..c1f2283518 100644
---
a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/java/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash.java
+++
b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/java/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash.java
@@ -17,6 +17,7 @@
package org.apache.nifi.processors.cybersecurity;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.behavior.EventDriven;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.SideEffectFree;
@@ -70,7 +71,7 @@ import java.util.Set;
"by the property. Note that: 'XXX' gets
replaced with the "),
@WritesAttribute(attribute = ".N.similarity", description = "The
similarity score between this flowfile" +
"and its match of the same number N. Note that: 'XXX' gets
replaced with the ")})
-
+@DeprecationNotice(reason = "Unmaintained and planned for removal in version
2.0")
public class CompareFuzzyHash extends AbstractFuzzyHashProcessor {
public static final AllowableValue singleMatch = new AllowableValue(
"single",
diff --git
a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/java/org/apache/nifi/processors/cybersecurity/FuzzyHashContent.java
b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/java/org/apache/nifi/processors/cybersecurity/FuzzyHashContent.java
index 78ed94fde1..34cb62c92f 100644
---
a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/java/org/apache/nifi/processors/cybersecurity/FuzzyHashContent.java
+++
b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/java/org/apache/nifi/processors/cybersecurity/FuzzyHashContent.java
@@ -18,6 +18,7 @@ package org.apache.nifi.processors.cybersecurity;
import com.idealista.tlsh.exceptions.InsufficientComplexityException;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.behavior.EventDriven;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.SideEffectFree;
@@ -70,7 +71,7 @@ import java.util.concurrent.atomic.AtomicReference;
@SeeAlso(classNames = {"org.apache.nifi.processors.standard.HashContent"},
value = {CompareFuzzyHash.class})
@WritesAttributes({@WritesAttribute(attribute = "",
description = "This Processor adds an attribute whose
[nifi] branch main updated: NIFI-12101: This closes #7768. Fixed bugs that caused StatelessBasicsIT.testChangeFlowVersion to fail. There were a couple of related issues. Firstly, for Stateless Groups
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
The following commit(s) were added to refs/heads/main by this push:
new 713be8b539 NIFI-12101: This closes #7768. Fixed bugs that caused
StatelessBasicsIT.testChangeFlowVersion to fail. There were a couple of related
issues. Firstly, for Stateless Groups we were not waiting for the group to
fully stop before attempting to update the flow but were waiting only for
child/descendant groups to stop. This was due to misleading naming in the
ProcessGroupUpdateStrategy enum. Renamed enum values to more clearly convey
what they mean. Additionally, renamed th [...]
713be8b539 is described below
commit 713be8b539f93d1b998aa187cdba178a7c46f155
Author: Mark Payne
AuthorDate: Thu Sep 21 10:02:41 2023 -0400
NIFI-12101: This closes #7768. Fixed bugs that caused
StatelessBasicsIT.testChangeFlowVersion to fail. There were a couple of related
issues. Firstly, for Stateless Groups we were not waiting for the group to
fully stop before attempting to update the flow but were waiting only for
child/descendant groups to stop. This was due to misleading naming in the
ProcessGroupUpdateStrategy enum. Renamed enum values to more clearly convey
what they mean. Additionally, renamed the enum to more c [...]
Fixed issue in logic of LocalComponentLifecycle, which was waiting for all
PGs to reach desired stateless run schedule, even when the group itself was not
stateless
Fixed JavaScript to specify correct value for recursivity when updating
process group parameter context
---
...eStrategy.java => ProcessGroupRecursivity.java} | 6 ++---
.../org/apache/nifi/web/NiFiServiceFacade.java | 14 +-
.../apache/nifi/web/StandardNiFiServiceFacade.java | 30 +++---
.../apache/nifi/web/api/ProcessGroupResource.java | 17 ++--
.../org/apache/nifi/web/api/dto/DtoFactory.java| 9 ++-
.../org/apache/nifi/web/dao/ProcessGroupDAO.java | 6 ++---
.../nifi/web/dao/impl/StandardProcessGroupDAO.java | 6 ++---
.../nifi/web/util/LocalComponentLifecycle.java | 28 +---
.../nifi/web/api/TestProcessGroupResource.java | 6 ++---
.../js/nf/canvas/nf-process-group-configuration.js | 4 +--
.../resources/conf/clustered/node1/nifi.properties | 4 ++-
.../resources/conf/clustered/node2/nifi.properties | 4 ++-
.../test/resources/conf/default/nifi.properties| 2 ++
13 files changed, 96 insertions(+), 40 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupUpdateStrategy.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupRecursivity.java
similarity index 90%
rename from
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupUpdateStrategy.java
rename to
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupRecursivity.java
index aea19be6ea..c6710b96f4 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupUpdateStrategy.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupRecursivity.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.web.api.entity;
-public enum ProcessGroupUpdateStrategy {
-CURRENT_GROUP,
-CURRENT_GROUP_WITH_CHILDREN
+public enum ProcessGroupRecursivity {
+DIRECT_CHILDREN,
+ALL_DESCENDANTS
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
index 419488d134..9d58078183 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
@@ -90,8 +90,6 @@ import org.apache.nifi.web.api.entity.AccessPolicyEntity;
import org.apache.nifi.web.api.entity.ActionEntity;
import org.apache.nifi.web.api.entity.ActivateControllerServicesEntity;
import org.apache.nifi.web.api.entity.AffectedComponentEntity;
-import org.apache.nifi.web.api.entity.FlowAnalysisResultEntity;
-import org.apache.nifi.web.api.entity.FlowRegistryBucketEntity;
import org.apache.nifi.web.api.entity.BulletinEntity;
import org.apache.nifi.web.api.entity.ComponentValidationResultEntity;
imp
[nifi] branch support/nifi-1.x updated: NIFI-12108 This closes #7773. Deprecated SpringContextProcessor for removal
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 1a5798b1fe NIFI-12108 This closes #7773. Deprecated
SpringContextProcessor for removal
1a5798b1fe is described below
commit 1a5798b1fe620e037c99e4900b85c8e6f8e4270b
Author: exceptionfactory
AuthorDate: Thu Sep 21 15:58:50 2023 -0500
NIFI-12108 This closes #7773. Deprecated SpringContextProcessor for removal
Signed-off-by: Joseph Witt
---
.../src/main/java/org/apache/nifi/spring/SpringContextProcessor.java| 2 ++
1 file changed, 2 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringContextProcessor.java
b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringContextProcessor.java
index c6497db850..a1d7edcee4 100644
---
a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringContextProcessor.java
+++
b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringContextProcessor.java
@@ -19,6 +19,7 @@ package org.apache.nifi.spring;
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.annotation.behavior.TriggerWhenEmpty;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.lifecycle.OnStopped;
@@ -133,6 +134,7 @@ import java.util.concurrent.TimeUnit;
* representation of the content that is being exchanged between NiFi and
* Spring.
*/
+@DeprecationNotice(reason = "Alternative event-handling solutions should be
used")
@TriggerWhenEmpty
@Tags({ "Spring", "Message", "Get", "Put", "Integration" })
@CapabilityDescription("A Processor that supports sending and receiving data
from application defined in "
[nifi] branch support/nifi-1.x updated: NIFI-12110 This closes #7775. Upgraded Spring Framework from 5.3.29 to 5.3.30
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new e7215bf5c1 NIFI-12110 This closes #7775. Upgraded Spring Framework from 5.3.29 to 5.3.30 e7215bf5c1 is described below commit e7215bf5c12fd9b87af40b15b5b2e9327dc5cdaa Author: exceptionfactory AuthorDate: Thu Sep 21 16:11:15 2023 -0500 NIFI-12110 This closes #7775. Upgraded Spring Framework from 5.3.29 to 5.3.30 - Upgraded Spring Boot from 2.7.15 to 2.7.16 for Registry Signed-off-by: Joseph Witt --- nifi-registry/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index 49db50ef04..21f2e0648b 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -36,7 +36,7 @@ 2.1.1 -2.7.15 +2.7.16 8.5.13 7.0.0 3.12.0 diff --git a/pom.xml b/pom.xml index 4a12becce1..a5d282e28f 100644 --- a/pom.xml +++ b/pom.xml @@ -144,7 +144,7 @@ 3.10.6.Final 2.2 4.1.97.Final -5.3.29 +5.3.30 5.8.7 1.6.11 2.2.224
[nifi] 02/03: NIFI-12109 This closes #7774. Removed SpringContextProcessor
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 a832b134b17fe45ae71b1ee763841ba90161f834 Author: exceptionfactory AuthorDate: Thu Sep 21 16:01:40 2023 -0500 NIFI-12109 This closes #7774. Removed SpringContextProcessor Signed-off-by: Joseph Witt --- nifi-assembly/pom.xml | 6 - .../nifi-spring-bundle/nifi-spring-nar/pom.xml | 35 -- .../src/main/resources/META-INF/LICENSE| 209 -- .../src/main/resources/META-INF/NOTICE | 19 - .../nifi-spring-processors/pom.xml | 70 .../apache/nifi/spring/SpringContextFactory.java | 151 --- .../apache/nifi/spring/SpringContextProcessor.java | 442 - .../apache/nifi/spring/SpringDataExchanger.java| 78 .../apache/nifi/spring/SpringNiFiConstants.java| 27 -- .../spring/bootstrap/SpringContextDelegate.java| 146 --- .../services/org.apache.nifi.processor.Processor | 15 - .../additionalDetails.html | 94 - .../nifi/spring/SpringContextFactoryTests.java | 116 -- .../nifi/spring/SpringContextProcessorTest.java| 153 --- .../src/test/resources/aggregated.xml | 26 -- .../src/test/resources/context.xml | 14 - .../src/test/resources/fromSpringOnly.xml | 27 -- .../src/test/resources/log4j.properties| 21 - .../src/test/resources/requestReply.xml| 27 -- .../src/test/resources/toSpringOnly.xml| 17 - nifi-nar-bundles/nifi-spring-bundle/pom.xml| 37 -- nifi-nar-bundles/pom.xml | 1 - 22 files changed, 1731 deletions(-) diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index 0daf8209d0..abcbd91366 100644 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -606,12 +606,6 @@ language governing permissions and limitations under the License. --> 2.0.0-SNAPSHOT nar - -org.apache.nifi -nifi-spring-nar -2.0.0-SNAPSHOT -nar - org.apache.nifi nifi-registry-nar diff --git a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/pom.xml b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/pom.xml deleted file mode 100644 index faf3f76afa..00 --- a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd;> - -4.0.0 - -org.apache.nifi -nifi-spring-bundle -2.0.0-SNAPSHOT - -nifi-spring-nar -nar -NiFi NAR for interacting with Spring - -true -true - - - -org.apache.nifi -nifi-spring-processors - - - diff --git a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/src/main/resources/META-INF/LICENSE b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/src/main/resources/META-INF/LICENSE deleted file mode 100644 index f3c8ecef26..00 --- a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,209 +0,0 @@ - - Apache License - Version 2.0, January 2004 -http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from me
[nifi] 03/03: NIFI-12095 This closes #7762. Increase default Xmx to 1g
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 9ae69212723d32edcdbfa1538b742ff2887d25c9 Author: Nandor Soma Abonyi AuthorDate: Wed Sep 20 11:06:38 2023 +0200 NIFI-12095 This closes #7762. Increase default Xmx to 1g Signed-off-by: Joseph Witt --- .../nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml index 5c430f5aef..7766f7ba60 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml @@ -25,8 +25,8 @@ Holds common resources used to build installers -512m -512m +1g +1g true
[nifi] branch main updated (b6bcce4fe1 -> 9ae6921272)
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 b6bcce4fe1 NIFI-12106 Upgraded Spring Boot from 2.7.14 to 2.7.15 new 4169352a2f NIFI-12110 This closes #7775. Upgraded Spring Framework from 5.3.29 to 5.3.30 new a832b134b1 NIFI-12109 This closes #7774. Removed SpringContextProcessor new 9ae6921272 NIFI-12095 This closes #7762. Increase default Xmx to 1g The 3 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-assembly/pom.xml | 6 - .../nifi-framework/nifi-resources/pom.xml | 4 +- .../nifi-spring-bundle/nifi-spring-nar/pom.xml | 35 -- .../src/main/resources/META-INF/LICENSE| 209 -- .../src/main/resources/META-INF/NOTICE | 19 - .../nifi-spring-processors/pom.xml | 70 .../apache/nifi/spring/SpringContextFactory.java | 151 --- .../apache/nifi/spring/SpringContextProcessor.java | 442 - .../apache/nifi/spring/SpringDataExchanger.java| 78 .../apache/nifi/spring/SpringNiFiConstants.java| 27 -- .../spring/bootstrap/SpringContextDelegate.java| 146 --- .../services/org.apache.nifi.processor.Processor | 15 - .../additionalDetails.html | 94 - .../nifi/spring/SpringContextFactoryTests.java | 116 -- .../nifi/spring/SpringContextProcessorTest.java| 153 --- .../src/test/resources/aggregated.xml | 26 -- .../src/test/resources/context.xml | 14 - .../src/test/resources/fromSpringOnly.xml | 27 -- .../src/test/resources/log4j.properties| 21 - .../src/test/resources/requestReply.xml| 27 -- .../src/test/resources/toSpringOnly.xml| 17 - nifi-nar-bundles/nifi-spring-bundle/pom.xml| 37 -- nifi-nar-bundles/pom.xml | 1 - nifi-registry/pom.xml | 2 +- pom.xml| 2 +- 25 files changed, 4 insertions(+), 1735 deletions(-) delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/pom.xml delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/src/main/resources/META-INF/LICENSE delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/src/main/resources/META-INF/NOTICE delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringContextFactory.java delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringContextProcessor.java delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringDataExchanger.java delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringNiFiConstants.java delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/bootstrap/SpringContextDelegate.java delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/resources/docs/org.apache.nifi.spring.SpringContextProcessor/additionalDetails.html delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/java/org/apache/nifi/spring/SpringContextFactoryTests.java delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/java/org/apache/nifi/spring/SpringContextProcessorTest.java delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/resources/aggregated.xml delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/resources/context.xml delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/resources/fromSpringOnly.xml delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/resources/log4j.properties delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/resources/requestReply.xml delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/resources/toSpringOnly.xml delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/pom.xml
[nifi] 01/03: NIFI-12110 This closes #7775. Upgraded Spring Framework from 5.3.29 to 5.3.30
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 4169352a2ff75685c7ef4b199833a1f011fee67b Author: exceptionfactory AuthorDate: Thu Sep 21 16:11:15 2023 -0500 NIFI-12110 This closes #7775. Upgraded Spring Framework from 5.3.29 to 5.3.30 - Upgraded Spring Boot from 2.7.15 to 2.7.16 for Registry Signed-off-by: Joseph Witt --- nifi-registry/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index 5d176243f1..23a9db16b8 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -36,7 +36,7 @@ 2.1.1 -2.7.15 +2.7.16 8.5.13 7.0.0 3.12.0 diff --git a/pom.xml b/pom.xml index dd48e2159e..5b4361ffdd 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ 3.10.6.Final 2.2 4.1.97.Final -5.3.29 +5.3.30 5.8.7 1.6.11 2.2.224
[nifi] branch support/nifi-1.x updated: NIFI-12086 This closes #7757. Removed unused jgit dependency from framework-core
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 237892988a NIFI-12086 This closes #7757. Removed unused jgit dependency from framework-core 237892988a is described below commit 237892988ad30f5437606621a0c3d36c5b1e5896 Author: exceptionfactory AuthorDate: Tue Sep 19 08:28:13 2023 -0500 NIFI-12086 This closes #7757. Removed unused jgit dependency from framework-core Signed-off-by: Joseph Witt --- .../nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml | 5 - nifi-nar-bundles/nifi-framework-bundle/pom.xml | 5 - 2 files changed, 10 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml index 26e2915589..2fba942a4f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml @@ -235,11 +235,6 @@ 1.24.0-SNAPSHOT test - -org.eclipse.jgit -org.eclipse.jgit -test - org.apache.nifi nifi-authorizer diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index cb19990555..7ee6abe6e7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -444,11 +444,6 @@ commons-collections4 4.4 - -org.eclipse.jgit -org.eclipse.jgit -4.3.1.201605051710-r - org.apache.curator curator-test
[nifi] branch main updated: NIFI-12086 This closes #7757. Removed unused jgit dependency from framework-core
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 The following commit(s) were added to refs/heads/main by this push: new 11d8519914 NIFI-12086 This closes #7757. Removed unused jgit dependency from framework-core 11d8519914 is described below commit 11d8519914dbbb8c5c3ed5bfae21e1681dedb03b Author: exceptionfactory AuthorDate: Tue Sep 19 08:28:13 2023 -0500 NIFI-12086 This closes #7757. Removed unused jgit dependency from framework-core Signed-off-by: Joseph Witt --- .../nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml | 5 - nifi-nar-bundles/nifi-framework-bundle/pom.xml | 5 - 2 files changed, 10 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml index 775f1d3a4f..41ee9b0bcf 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml @@ -268,11 +268,6 @@ 2.0.0-SNAPSHOT test - -org.eclipse.jgit -org.eclipse.jgit -test - org.apache.nifi nifi-authorizer diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 3dbf290fd5..93cf03d92f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -473,11 +473,6 @@ commons-collections4 4.4 - -org.eclipse.jgit -org.eclipse.jgit -4.3.1.201605051710-r - org.apache.curator curator-test
[nifi] branch support/nifi-1.x updated: NIFI-12093 This closes #7766. Deprecated EncryptContent Processor
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new bc7a20068c NIFI-12093 This closes #7766. Deprecated EncryptContent
Processor
bc7a20068c is described below
commit bc7a20068c1c0f26c9e3929b9736e522113a9cc0
Author: exceptionfactory
AuthorDate: Wed Sep 20 13:36:53 2023 -0500
NIFI-12093 This closes #7766. Deprecated EncryptContent Processor
Signed-off-by: Joseph Witt
---
.../org/apache/nifi/processors/standard/EncryptContent.java | 12
1 file changed, 12 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncryptContent.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncryptContent.java
index 7fc901b8ff..184190ed3f 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncryptContent.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncryptContent.java
@@ -43,6 +43,7 @@ import
org.apache.nifi.annotation.behavior.SystemResourceConsideration;
import org.apache.nifi.annotation.behavior.WritesAttribute;
import org.apache.nifi.annotation.behavior.WritesAttributes;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.AllowableValue;
import org.apache.nifi.components.PropertyDescriptor;
@@ -99,6 +100,17 @@ import org.bouncycastle.openpgp.PGPEncryptedData;
@WritesAttribute(attribute = "encryptcontent.salt_length", description
= "The raw salt length in bytes"),
@WritesAttribute(attribute = "encryptcontent.timestamp", description =
"The timestamp at which the cryptographic operation occurred in '-MM-dd
HH:mm:ss.SSS Z' format"),
})
+@DeprecationNotice(
+classNames = {
+"org.apache.nifi.processors.pgp.EncryptContentPGP",
+"org.apache.nifi.processors.pgp.DecryptContentPGP",
+"org.apache.nifi.processors.cipher.DecryptContent",
+
"org.apache.nifi.processors.cipher.DecryptContentCompatibility",
+"org.apache.nifi.processors.cipher.EncryptContentAge",
+"org.apache.nifi.processors.cipher.DecryptContentAge",
+},
+reason = "EncryptContentAge or EncryptContentPGP should be used for
encrypting new files using standard formatting. DecryptContent supports
deciphering historical files."
+)
public class EncryptContent extends AbstractProcessor {
public static final String ENCRYPT_MODE = "Encrypt";
[nifi] branch support/nifi-1.x updated: NIFI-11903 disable if windows (#7566)
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new bf0bb81361 NIFI-11903 disable if windows (#7566)
bf0bb81361 is described below
commit bf0bb8136156315ad6d0539a56cf1d4b4c63d2ce
Author: Joe Witt
AuthorDate: Tue Sep 19 13:22:49 2023 -0700
NIFI-11903 disable if windows (#7566)
---
.../apache/nifi/controller/state/server/TestZooKeeperStateServer.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
index 33b982dd1e..9cebded58a 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
@@ -28,6 +28,7 @@ import
org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
import java.io.IOException;
import java.io.PrintWriter;
@@ -40,7 +41,9 @@ import java.util.Properties;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.condition.OS.WINDOWS;
+@DisabledOnOs(WINDOWS)
public class TestZooKeeperStateServer {
private static ZooKeeperStateServer zkServer;
[nifi] branch support/nifi-1.x updated: NIFI-12034 This closes #7729. Upgraded Apache Commons Compress from 1.23.0 to 1.24.0
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new ab67daf891 NIFI-12034 This closes #7729. Upgraded Apache Commons Compress from 1.23.0 to 1.24.0 ab67daf891 is described below commit ab67daf8912e8938dcb6405e6d15e4957b4da920 Author: exceptionfactory AuthorDate: Thu Sep 14 15:10:40 2023 -0500 NIFI-12034 This closes #7729. Upgraded Apache Commons Compress from 1.23.0 to 1.24.0 Signed-off-by: Joseph Witt --- c2/c2-client-bundle/c2-client-service/pom.xml | 1 - nifi-commons/nifi-flowfile-packager/pom.xml | 1 - nifi-nar-bundles/nifi-atlas-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-avro-bundle/pom.xml | 11 --- nifi-nar-bundles/nifi-cassandra-bundle/pom.xml| 6 -- .../nifi-compress-bundle/nifi-compress-processors/pom.xml | 1 - nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml | 11 --- nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml| 7 --- .../nifi-extension-utils/nifi-database-utils/pom.xml | 11 --- .../nifi-extension-utils/nifi-hadoop-utils/pom.xml| 10 -- .../nifi-record-utils/nifi-hadoop-record-utils/pom.xml| 10 -- .../nifi-extension-utils/nifi-record-utils/pom.xml| 6 -- nifi-nar-bundles/nifi-framework-bundle/pom.xml| 5 - nifi-nar-bundles/nifi-graph-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-hbase-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-hive-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-iceberg-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-media-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-mongodb-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-parquet-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-poi-bundle/pom.xml | 5 - nifi-nar-bundles/nifi-ranger-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-registry-bundle/pom.xml | 11 --- nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 9 - .../nifi-hadoop-dbcp-service-bundle/pom.xml | 10 -- .../nifi-hbase_2-client-service-bundle/pom.xml| 6 -- .../nifi-lookup-services-bundle/pom.xml | 10 -- .../nifi-record-serialization-services-bundle/pom.xml | 11 --- nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml | 11 --- .../nifi-registry-extensions/nifi-registry-ranger/pom.xml | 6 -- pom.xml | 6 ++ 34 files changed, 6 insertions(+), 231 deletions(-) diff --git a/c2/c2-client-bundle/c2-client-service/pom.xml b/c2/c2-client-bundle/c2-client-service/pom.xml index 8fc6d9b9bb..e8114f4301 100644 --- a/c2/c2-client-bundle/c2-client-service/pom.xml +++ b/c2/c2-client-bundle/c2-client-service/pom.xml @@ -46,7 +46,6 @@ limitations under the License. org.apache.commons commons-compress -1.23.0 \ No newline at end of file diff --git a/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi-commons/nifi-flowfile-packager/pom.xml index c91934e1d5..90fb83415a 100644 --- a/nifi-commons/nifi-flowfile-packager/pom.xml +++ b/nifi-commons/nifi-flowfile-packager/pom.xml @@ -25,7 +25,6 @@ org.apache.commons commons-compress -1.23.0 org.apache.commons diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml index 4772325560..17e9c8ae04 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml @@ -81,12 +81,6 @@ - - -org.apache.commons -commons-compress -1.23.0 - com.nimbusds diff --git a/nifi-nar-bundles/nifi-avro-bundle/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/pom.xml index 352a754bc0..36c70fd0ba 100644 --- a/nifi-nar-bundles/nifi-avro-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-avro-bundle/pom.xml @@ -29,15 +29,4 @@ nifi-avro-processors nifi-avro-nar
[nifi] branch main updated: NIFI-12034 This closes #7729. Upgraded Apache Commons Compress from 1.23.0 to 1.24.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 The following commit(s) were added to refs/heads/main by this push: new aee9f2c65d NIFI-12034 This closes #7729. Upgraded Apache Commons Compress from 1.23.0 to 1.24.0 aee9f2c65d is described below commit aee9f2c65d6d7aeaa278f1a962b2ba070e14ea87 Author: exceptionfactory AuthorDate: Thu Sep 14 15:10:40 2023 -0500 NIFI-12034 This closes #7729. Upgraded Apache Commons Compress from 1.23.0 to 1.24.0 Signed-off-by: Joseph Witt --- c2/c2-client-bundle/c2-client-service/pom.xml | 1 - nifi-commons/nifi-flowfile-packager/pom.xml | 1 - nifi-nar-bundles/nifi-atlas-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-avro-bundle/pom.xml | 11 --- nifi-nar-bundles/nifi-cassandra-bundle/pom.xml| 6 -- .../nifi-compress-bundle/nifi-compress-processors/pom.xml | 1 - nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml | 11 --- nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml| 7 --- .../nifi-extension-utils/nifi-database-utils/pom.xml | 11 --- .../nifi-extension-utils/nifi-hadoop-utils/pom.xml| 10 -- .../nifi-record-utils/nifi-hadoop-record-utils/pom.xml| 10 -- .../nifi-extension-utils/nifi-record-utils/pom.xml| 6 -- nifi-nar-bundles/nifi-framework-bundle/pom.xml| 5 - nifi-nar-bundles/nifi-graph-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-hbase-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-hive-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-iceberg-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-media-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-mongodb-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-parquet-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-poi-bundle/pom.xml | 5 - nifi-nar-bundles/nifi-ranger-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-registry-bundle/pom.xml | 11 --- nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 9 - .../nifi-hadoop-dbcp-service-bundle/pom.xml | 10 -- .../nifi-hbase_2-client-service-bundle/pom.xml| 6 -- .../nifi-lookup-services-bundle/pom.xml | 10 -- .../nifi-record-serialization-services-bundle/pom.xml | 11 --- nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml | 11 --- .../nifi-registry-extensions/nifi-registry-ranger/pom.xml | 6 -- pom.xml | 6 ++ 34 files changed, 6 insertions(+), 231 deletions(-) diff --git a/c2/c2-client-bundle/c2-client-service/pom.xml b/c2/c2-client-bundle/c2-client-service/pom.xml index e7bb1f6828..4b527b6019 100644 --- a/c2/c2-client-bundle/c2-client-service/pom.xml +++ b/c2/c2-client-bundle/c2-client-service/pom.xml @@ -46,7 +46,6 @@ limitations under the License. org.apache.commons commons-compress -1.23.0 \ No newline at end of file diff --git a/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi-commons/nifi-flowfile-packager/pom.xml index 8ec1f83c1b..700a7f8d47 100644 --- a/nifi-commons/nifi-flowfile-packager/pom.xml +++ b/nifi-commons/nifi-flowfile-packager/pom.xml @@ -25,7 +25,6 @@ org.apache.commons commons-compress -1.23.0 org.apache.commons diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml index 6dda4fc694..eb2ceb2d63 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml @@ -81,12 +81,6 @@ - - -org.apache.commons -commons-compress -1.23.0 - com.nimbusds diff --git a/nifi-nar-bundles/nifi-avro-bundle/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/pom.xml index 0b6565dfa5..d1026843da 100644 --- a/nifi-nar-bundles/nifi-avro-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-avro-bundle/pom.xml @@ -29,15 +29,4 @@ nifi-avro-processors nifi-avro-nar - - - - - -org.apache.commons
[nifi] branch main updated: NIFI-12016: This closes #7662. Allow use of compatible NAR bundles when loading flow from cluster connection; when determining what bundles are compatible, consider not jus
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
The following commit(s) were added to refs/heads/main by this push:
new f27ace1ccf NIFI-12016: This closes #7662. Allow use of compatible NAR
bundles when loading flow from cluster connection; when determining what
bundles are compatible, consider not just any bundle if it's the only one but
also any bundle whose version matches the framework version so that when NiFi
is upgraded, it is handled more gracefully.
f27ace1ccf is described below
commit f27ace1ccf36cb0f7a958462499c388652dde1c0
Author: Mark Payne
AuthorDate: Wed Aug 30 17:39:31 2023 -0400
NIFI-12016: This closes #7662. Allow use of compatible NAR bundles when
loading flow from cluster connection; when determining what bundles are
compatible, consider not just any bundle if it's the only one but also any
bundle whose version matches the framework version so that when NiFi is
upgraded, it is handled more gracefully.
Signed-off-by: Joseph Witt
---
.../java/org/apache/nifi/util/BundleUtils.java | 44 ++---
.../java/org/apache/nifi/util/TestBundleUtils.java | 100 +++
.../nifi/controller/StandardFlowService.java | 2 +-
.../system/clustering/FlowSynchronizationIT.java | 109 -
4 files changed, 133 insertions(+), 122 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/BundleUtils.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/BundleUtils.java
index d0c428f263..d7ad003f62 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/BundleUtils.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/BundleUtils.java
@@ -20,22 +20,40 @@ import org.apache.nifi.bundle.Bundle;
import org.apache.nifi.bundle.BundleCoordinate;
import org.apache.nifi.flow.VersionedProcessGroup;
import org.apache.nifi.nar.ExtensionManager;
+import org.apache.nifi.nar.NarClassLoadersHolder;
import org.apache.nifi.nar.PythonBundle;
import org.apache.nifi.web.api.dto.BundleDTO;
import java.util.List;
import java.util.Optional;
-import java.util.stream.Collectors;
/**
* Utility class for Bundles.
*/
public final class BundleUtils {
-private static Optional findOptionalBundleForType(final
ExtensionManager extensionManager, final String type, final BundleCoordinate
desiredCoordinate) {
+static Optional findOptionalBundleForType(final
ExtensionManager extensionManager, final String type, final Bundle
frameworkBundle) {
final List bundles = extensionManager.getBundles(type);
if (bundles.size() == 1) {
return
Optional.of(bundles.get(0).getBundleDetails().getCoordinate());
}
+
+// All NARs that are packaged with NiFi will have the same bundle
coordinate as the NiFi framework bundle.
+// During an upgrade, it's fairly common to have two versions of a
NAR: the version shipped with NiFi and another version, perhaps to maintain
+// backward compatibility to because the new version behaves some
different way and the user wants the old behavior in some instances, etc.
+// In this case, the user may have two versions. For example, version
2.2.0 and 2.4.0 while NiFi is at version 2.4.0.
+// Now, during upgrade to 2.4.1, there will no longer be a 2.4.0
available. We want to be smart enough to realize that those extension using
version
+// 2.2.0 stay there but those using 2.4.0 upgrade to 2.4.1.
+// To do this, we always first match on the exact version but this
method is called when there's no exact match. So those marked 2.2.0 won't
arrive here.
+// But for those extensions that were using 2.4.0, we want to now look
for version 2.4.1 - I.e., the one with the same version as the framework. If we
+// find that version, then we want to use it. This helps to smooth out
the upgrade process even when users have multiple versions of a given NAR.
+final String frameworkVersion =
frameworkBundle.getBundleDetails().getCoordinate().getVersion();
+for (final Bundle bundle : bundles) {
+final String componentVersion =
bundle.getBundleDetails().getCoordinate().getVersion();
+if (frameworkVersion.equals(componentVersion)) {
+return Optional.of(bundle.getBundleDetails().getCoordinate());
+}
+}
+
return Optional.empty();
}
@@ -71,7 +89,10 @@ public final class BundleUtils {
throw new IllegalStateException(String.format("%s from %s is
not known to this NiFi instance.", type,
[nifi] branch support/nifi-1.x updated: NIFI-12058 Upgraded Apache Kudu from 1.16.0 to 1.17.0
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 0157d72b49 NIFI-12058 Upgraded Apache Kudu from 1.16.0 to 1.17.0
0157d72b49 is described below
commit 0157d72b49ae2c530ff68e6f80b1db5257dd7c28
Author: exceptionfactory
AuthorDate: Thu Sep 14 10:53:10 2023 -0500
NIFI-12058 Upgraded Apache Kudu from 1.16.0 to 1.17.0
Signed-off-by: Joseph Witt
---
nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml | 6 ++
nifi-nar-bundles/nifi-kudu-bundle/pom.xml | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
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 ac70b22ea4..3de82819a0 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
@@ -94,6 +94,12 @@
kudu-test-utils
${kudu.version}
test
+
+
+org.apache.logging.log4j
+log4j-core
+
+
org.apache.nifi
diff --git a/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
b/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
index 92db171940..73424bf7dc 100644
--- a/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
@@ -27,7 +27,7 @@
None
-1.16.0
+1.17.0
[nifi] branch main updated: NIFI-12058 This closes #7693. Upgraded Apache Kudu from 1.16.0 to 1.17.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
The following commit(s) were added to refs/heads/main by this push:
new 292b5d18a0 NIFI-12058 This closes #7693. Upgraded Apache Kudu from
1.16.0 to 1.17.0
292b5d18a0 is described below
commit 292b5d18a0a5d8e58e6a399ae9fb5241fe493ded
Author: exceptionfactory
AuthorDate: Thu Sep 14 10:53:10 2023 -0500
NIFI-12058 This closes #7693. Upgraded Apache Kudu from 1.16.0 to 1.17.0
Signed-off-by: Joseph Witt
---
nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml | 6 ++
nifi-nar-bundles/nifi-kudu-bundle/pom.xml | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
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 c6c7b1d6c4..8ea6beacee 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
@@ -94,6 +94,12 @@
kudu-test-utils
${kudu.version}
test
+
+
+org.apache.logging.log4j
+log4j-core
+
+
org.apache.nifi
diff --git a/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
b/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
index 152c3cbc5c..5332031f5b 100644
--- a/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
@@ -27,7 +27,7 @@
None
-1.16.0
+1.17.0
[nifi] branch support/nifi-1.x updated: NIFI-12057 Refactored Groovy tests to Java in nifi-lookup-services
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 4edf713bae NIFI-12057 Refactored Groovy tests to Java in
nifi-lookup-services
4edf713bae is described below
commit 4edf713baecfb02f4d8ada0fd075b9ca04ca559f
Author: exceptionfactory
AuthorDate: Thu Sep 14 09:06:22 2023 -0500
NIFI-12057 Refactored Groovy tests to Java in nifi-lookup-services
Signed-off-by: Joseph Witt
---
.../nifi-lookup-services/pom.xml | 28 +--
.../nifi/lookup/TestRestLookupService.groovy | 160 --
.../lookup/TestRestLookupServiceProcessor.groovy | 45
.../db/TestDatabaseRecordLookupService.groovy | 229 -
.../db/TestSimpleDatabaseLookupService.groovy | 186 -
.../nifi/lookup/rest/MockRestLookupService.groovy | 38
.../org/apache/nifi/lookup/rest/SchemaUtil.groovy | 24 ---
.../nifi/lookup/rest/handlers/BasicAuth.groovy | 55 -
.../nifi/lookup/rest/handlers/ComplexJson.groovy | 45
.../nifi/lookup/rest/handlers/NoRecord.groovy | 40
.../nifi/lookup/rest/handlers/SimpleJson.groovy| 45
.../lookup/rest/handlers/SimpleJsonArray.groovy| 42
.../nifi/lookup/rest/handlers/VerbTest.groovy | 70 ---
.../apache/nifi/lookup/TestRestLookupService.java | 190 +
.../lookup/db/TestDatabaseRecordLookupService.java | 161 +++
.../lookup/db/TestSimpleDatabaseLookupService.java | 146 +
.../src/test/resources/complex.avsc| 36
.../src/test/resources/simple.avsc | 14 --
18 files changed, 501 insertions(+), 1053 deletions(-)
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 bfcdfb3d25..9360b3e487 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
@@ -127,6 +127,10 @@
2.7
compile
+
+com.squareup.okhttp3
+mockwebserver
+
org.apache.nifi
nifi-mock
@@ -154,28 +158,6 @@
nifi-schema-registry-service-api
test
-
-javax.servlet
-javax.servlet-api
-test
-
-
-org.eclipse.jetty
-jetty-servlet
-test
-
-
-org.apache.derby
-derby
-10.14.2.0
-test
-
-
-org.codehaus.groovy
-groovy-json
-${nifi.groovy.version}
-test
-
@@ -184,8 +166,6 @@
apache-rat-plugin
- src/test/resources/complex.avsc
- src/test/resources/simple.avsc
src/test/resources/test.csv
src/test/resources/test_sep_escape_comment.csv
src/test/resources/test_Windows-31J.csv
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
deleted file mode 100644
index 2184f3d72f..00
---
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
+++ /dev/null
@@ -1,160 +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.
- */
-
-package org.apache.nifi.lookup
-
-import okhttp3.MediaType
-imp
[nifi] branch main updated: NIFI-12057 Refactored Groovy tests to Java in nifi-lookup-services
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
The following commit(s) were added to refs/heads/main by this push:
new 591c323f0a NIFI-12057 Refactored Groovy tests to Java in
nifi-lookup-services
591c323f0a is described below
commit 591c323f0a64c430fa0d76325cfbe6a3b9a62e07
Author: exceptionfactory
AuthorDate: Thu Sep 14 09:06:22 2023 -0500
NIFI-12057 Refactored Groovy tests to Java in nifi-lookup-services
Signed-off-by: Joseph Witt
---
.../nifi-lookup-services/pom.xml | 34 +--
.../nifi/lookup/TestRestLookupService.groovy | 160 --
.../lookup/TestRestLookupServiceProcessor.groovy | 45
.../db/TestDatabaseRecordLookupService.groovy | 229 -
.../db/TestSimpleDatabaseLookupService.groovy | 186 -
.../nifi/lookup/rest/MockRestLookupService.groovy | 38
.../org/apache/nifi/lookup/rest/SchemaUtil.groovy | 24 ---
.../nifi/lookup/rest/handlers/BasicAuth.groovy | 55 -
.../nifi/lookup/rest/handlers/ComplexJson.groovy | 45
.../nifi/lookup/rest/handlers/NoRecord.groovy | 40
.../nifi/lookup/rest/handlers/SimpleJson.groovy| 45
.../lookup/rest/handlers/SimpleJsonArray.groovy| 42
.../nifi/lookup/rest/handlers/VerbTest.groovy | 70 ---
.../apache/nifi/lookup/TestRestLookupService.java | 190 +
.../lookup/db/TestDatabaseRecordLookupService.java | 161 +++
.../lookup/db/TestSimpleDatabaseLookupService.java | 146 +
.../src/test/resources/complex.avsc| 36
.../src/test/resources/simple.avsc | 14 --
18 files changed, 501 insertions(+), 1059 deletions(-)
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 af9c124788..81cd910588 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
@@ -127,6 +127,10 @@
2.7
compile
+
+com.squareup.okhttp3
+mockwebserver
+
org.apache.nifi
nifi-mock
@@ -154,34 +158,6 @@
nifi-schema-registry-service-api
test
-
-javax.servlet
-javax.servlet-api
-test
-
-
-org.eclipse.jetty
-jetty-servlet
-test
-
-
-org.apache.derby
-derby
-${derby.version}
-test
-
-
-org.apache.derby
-derbytools
-${derby.version}
-test
-
-
-org.codehaus.groovy
-groovy-json
-${nifi.groovy.version}
-test
-
@@ -190,8 +166,6 @@
apache-rat-plugin
- src/test/resources/complex.avsc
- src/test/resources/simple.avsc
src/test/resources/test.csv
src/test/resources/test_sep_escape_comment.csv
src/test/resources/test_Windows-31J.csv
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
deleted file mode 100644
index 2184f3d72f..00
---
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
+++ /dev/null
@@ -1,160 +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
-
svn commit: r1912110 - /comdev/projects.apache.org/trunk/data/projects.xml
Author: joewitt Date: Tue Sep 5 17:00:03 2023 New Revision: 1912110 URL: http://svn.apache.org/viewvc?rev=1912110=rev Log: Added NiFi doap entry Modified: comdev/projects.apache.org/trunk/data/projects.xml Modified: comdev/projects.apache.org/trunk/data/projects.xml URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/data/projects.xml?rev=1912110=1912109=1912110=diff == --- comdev/projects.apache.org/trunk/data/projects.xml (original) +++ comdev/projects.apache.org/trunk/data/projects.xml Tue Sep 5 17:00:03 2023 @@ -255,6 +255,7 @@ https://gitbox.apache.org/repos/asf?p=myfaces.git;a=blob_plain;f=doap_MyFaces.rdf;hb=HEAD https://gitbox.apache.org/repos/asf?p=myfaces-tobago.git;a=blob_plain;f=doap.rdf;hb=HEAD https://netbeans.apache.org/doap_NetBeans.rdf + https://raw.githubusercontent.com/apache/nifi/main/doap.rdf http://nutch.apache.org/doap.rdf https://ofbiz.apache.org/doap_OFBiz.rdf http://olingo.apache.org/doap_Olingo.rdf
[nifi] branch main updated: ASF required doap file entry
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 The following commit(s) were added to refs/heads/main by this push: new 25a3cd335c ASF required doap file entry 25a3cd335c is described below commit 25a3cd335c0a2301b31ea1ed2181721c678536b2 Author: Joseph Witt AuthorDate: Tue Sep 5 09:56:29 2023 -0700 ASF required doap file entry --- doap.rdf | 50 ++ 1 file changed, 50 insertions(+) diff --git a/doap.rdf b/doap.rdf new file mode 100644 index 00..3ad087cd75 --- /dev/null +++ b/doap.rdf @@ -0,0 +1,50 @@ + + +http://usefulinc.com/ns/doap#; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:asfext="http://projects.apache.org/ns/asfext#; + xmlns:foaf="http://xmlns.com/foaf/0.1/;> + + https://nifi.apache.org/;> +2023-09-05 +https://spdx.org/licenses/Apache-2.0; /> +Apache NiFi +https://nifi.apache.org/; /> +https://nifi.apache.org; /> +NiFi is an easy to use, powerful, and reliable system to process and +distribute data +The mission of NiFi is the creation and maintenance of software related to providing an easy to use, powerful, and reliable system to process and distribute data. + +Apache NiFi MiNiFi is an edge data collection agent built to seamlessly integrate with and leverage the command and control of NiFi. There are both Java and C++ implementations. + +Apache NiFi Registry is a centralized registry for key configuration items including flow versions, assets, and extensions for Apache NiFi and Apache MiNiFi. +https://issues.apache.org/jira/projects/NIFI; /> +https://nifi.apache.org/mailing_lists.html; /> +https://nifi.apache.org/download.html; /> +Java +https://projects.apache.org/category/big-data; /> + + +https://github.com/apache/nifi"/> +https://github.com/apache/nifi"/> + + + + +
[nifi] branch NIFI-11903 deleted (was 490810452c)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch NIFI-11903 in repository https://gitbox.apache.org/repos/asf/nifi.git was 490810452c NIFI-11903 disable if windows This change permanently discards the following revisions: discard 490810452c NIFI-11903 disable if windows
[nifi] 01/01: NIFI-11903 disable if windows
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch NIFI-11903
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 490810452c092b0121c3ac3c5f3e54bbc1324103
Author: Joseph Witt
AuthorDate: Wed Aug 2 16:04:22 2023 -0700
NIFI-11903 disable if windows
---
.../apache/nifi/controller/state/server/TestZooKeeperStateServer.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
index 33b982dd1e..9cebded58a 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
@@ -28,6 +28,7 @@ import
org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
import java.io.IOException;
import java.io.PrintWriter;
@@ -40,7 +41,9 @@ import java.util.Properties;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.condition.OS.WINDOWS;
+@DisabledOnOs(WINDOWS)
public class TestZooKeeperStateServer {
private static ZooKeeperStateServer zkServer;
[nifi] branch NIFI-11903 created (now 490810452c)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch NIFI-11903 in repository https://gitbox.apache.org/repos/asf/nifi.git at 490810452c NIFI-11903 disable if windows This branch includes the following new commits: new 490810452c NIFI-11903 disable if windows The 1 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.
svn commit: r62865 - /dev/nifi/nifi-standard-nar-1.21.0-zipfix.nar
Author: joewitt Date: Fri Jul 7 17:38:44 2023 New Revision: 62865 Log: uploading a dev test nar for NIFI-11434 Added: dev/nifi/nifi-standard-nar-1.21.0-zipfix.nar (with props) Added: dev/nifi/nifi-standard-nar-1.21.0-zipfix.nar == Binary file - no diff available. Propchange: dev/nifi/nifi-standard-nar-1.21.0-zipfix.nar -- svn:mime-type = application/octet-stream
[nifi-site] branch main updated: NIFI-11654 updating for latest release
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-site.git The following commit(s) were added to refs/heads/main by this push: new 5e1ba16 NIFI-11654 updating for latest release 5e1ba16 is described below commit 5e1ba16686880e506d7b702e8c29be04a0973dba Author: Joe Witt AuthorDate: Sun Jun 11 21:23:31 2023 -0400 NIFI-11654 updating for latest release --- config.toml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config.toml b/config.toml index 6dd61b3..caadf3e 100644 --- a/config.toml +++ b/config.toml @@ -47,7 +47,7 @@ downloadPathUrl = "https://downloads.apache.org/nifi; archiveDownloadPathUrl = "https://archive.apache.org/dist/nifi; mavenCentralDownloadPathUrl = "https://repo1.maven.org/maven2/org/apache/nifi; -currentProjectVersion = "1.21.0" -currentProjectVersionReleased = "2023-04-07" -previousProjectVersion = "1.20.0" -previousProjectVersionReleased = "2023-02-09" +currentProjectVersion = "1.22.0" +currentProjectVersionReleased = "2023-06-11" +previousProjectVersion = "1.21.0" +previousProjectVersionReleased = "2023-04-07"
svn commit: r62367 - in /release/nifi: 1.21.0/ nifi-fds/nifi-fds-0.2.0/ nifi-minifi-cpp/0.10.0/ nifi-minifi-cpp/0.11.0/ nifi-minifi-cpp/0.12.0/ nifi-minifi-cpp/0.13.0/ nifi-minifi-cpp/0.9.0/
Author: joewitt Date: Mon Jun 12 01:21:42 2023 New Revision: 62367 Log: Clean up old artifacts already in archive Removed: release/nifi/1.21.0/ release/nifi/nifi-fds/nifi-fds-0.2.0/ release/nifi/nifi-minifi-cpp/0.10.0/ release/nifi/nifi-minifi-cpp/0.11.0/ release/nifi/nifi-minifi-cpp/0.12.0/ release/nifi/nifi-minifi-cpp/0.13.0/ release/nifi/nifi-minifi-cpp/0.9.0/
[nifi] annotated tag rel/nifi-1.22.0 created (now 2a7635e8bb)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to annotated tag rel/nifi-1.22.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 2a7635e8bb (tag) tagging 71e3ea9f2c58d0cf2ce6824c388f2bd3e917dfc8 (commit) replaces rel/nifi-1.21.0 by Joe Witt on Sun Jun 11 21:02:49 2023 -0400 - Log - NIFI-11654 Signed release tag for approved release of NiFi 1.22.0 -BEGIN PGP SIGNATURE- iQEzBAABCAAdFiEE0vJLgJ/6seIa6gKDkJO/hU+BGhoFAmSGbrkACgkQkJO/hU+B GhrqtQgApDEfyPwa2tAU37eXGjMru5M9+Mqx8HuVUmXQ+bCYWp0E31I9XM7qCvyG 3RsCCUhzDCcfzz3QBTa0UAXRZ1b9WQDbcBhxzMKaWn1gcABYDL6GFUnxYrUk0if/ nBAwOlWWMaQFu6IbutzR6orLq7JiuRT8gHadlT+IH2Qi2+Ska3h7usOt+/at2uTT Us0htUJgCZV/96Ep3pDzUx9PZ1q+aSuyZgv7fJ9pGUiR426dEkW/jXFtt3oRJb3l tUXXOZxSW2z2EuLWgU9q3ibJb3ZnsKbzjyJDcsfHXyj2ncsBsBp1WGEQS8URPvhl vMxve0yK+LDpFQRxFOIJCw7yCiJxzQ== =JXPO -END PGP SIGNATURE- --- No new revisions were added by this update.
[nifi] 01/02: Merge branch 'NIFI-11654-RC1' into support/nifi-1.x
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git commit edc9e40582d39506d34f7679017a344738e44ca9 Merge: 728b07b30f f1d5a8c4de Author: Joe Witt AuthorDate: Sun Jun 11 20:45:15 2023 -0400 Merge branch 'NIFI-11654-RC1' into support/nifi-1.x c2/c2-client-bundle/c2-client-api/pom.xml | 4 +- c2/c2-client-bundle/c2-client-base/pom.xml | 6 +- c2/c2-client-bundle/c2-client-http/pom.xml | 8 +- c2/c2-client-bundle/c2-client-service/pom.xml | 8 +- c2/c2-client-bundle/pom.xml| 2 +- c2/c2-protocol/c2-protocol-api/pom.xml | 4 +- c2/c2-protocol/c2-protocol-component-api/pom.xml | 2 +- c2/c2-protocol/pom.xml | 2 +- c2/pom.xml | 4 +- minifi/minifi-assembly/pom.xml | 6 +- minifi/minifi-bootstrap/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-api/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-assembly/pom.xml| 2 +- .../minifi-c2-cache-filesystem/pom.xml | 2 +- .../minifi-c2-cache/minifi-c2-cache-s3/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-cache/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-docker/pom.xml | 4 +- .../minifi-c2/minifi-c2-integration-tests/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-jetty/pom.xml | 2 +- .../minifi-c2-provider-cache/pom.xml | 2 +- .../minifi-c2-provider-delegating/pom.xml | 2 +- .../minifi-c2-provider-nifi-rest/pom.xml | 2 +- .../minifi-c2-provider-util/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-provider/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-service/pom.xml | 6 +- minifi/minifi-c2/pom.xml | 2 +- minifi/minifi-commons/minifi-commons-api/pom.xml | 2 +- .../minifi-commons/minifi-commons-schema/pom.xml | 2 +- minifi/minifi-commons/minifi-utils/pom.xml | 2 +- minifi/minifi-commons/pom.xml | 2 +- minifi/minifi-docker/pom.xml | 2 +- minifi/minifi-docs/pom.xml | 2 +- minifi/minifi-integration-tests/pom.xml| 2 +- .../minifi-framework-nar/pom.xml | 2 +- .../minifi-framework/minifi-framework-api/pom.xml | 8 +- .../minifi-framework/minifi-framework-core/pom.xml | 6 +- .../minifi-framework/minifi-resources/pom.xml | 2 +- .../minifi-framework/minifi-runtime/pom.xml| 2 +- .../minifi-framework/minifi-server/pom.xml | 2 +- .../minifi-framework/pom.xml | 2 +- .../minifi-server-nar/pom.xml | 8 +- .../minifi-framework-bundle/pom.xml| 20 +- .../minifi-provenance-repositories/pom.xml | 2 +- .../minifi-provenance-repository-nar/pom.xml | 2 +- .../minifi-provenance-repository-bundle/pom.xml| 2 +- .../minifi-nar-bundles/minifi-standard-nar/pom.xml | 8 +- .../minifi-update-attribute-nar/pom.xml| 6 +- minifi/minifi-nar-bundles/pom.xml | 2 +- .../minifi-toolkit/minifi-toolkit-assembly/pom.xml | 2 +- .../minifi-toolkit-configuration/pom.xml | 2 +- minifi/minifi-toolkit/pom.xml | 2 +- minifi/pom.xml | 148 - nifi-api/pom.xml | 2 +- nifi-assembly/pom.xml | 350 ++--- nifi-bootstrap/pom.xml | 24 +- nifi-commons/nifi-bootstrap-utils/pom.xml | 2 +- nifi-commons/nifi-build/pom.xml| 2 +- nifi-commons/nifi-data-provenance-utils/pom.xml| 8 +- nifi-commons/nifi-deprecation-log/pom.xml | 2 +- nifi-commons/nifi-expression-language/pom.xml | 10 +- nifi-commons/nifi-external-resource-utils/pom.xml | 4 +- nifi-commons/nifi-flow-encryptor/pom.xml | 6 +- nifi-commons/nifi-flowfile-packager/pom.xml| 2 +- nifi-commons/nifi-hashicorp-vault-api/pom.xml | 2 +- nifi-commons/nifi-hashicorp-vault/pom.xml | 10 +- nifi-commons/nifi-hl7-query-language/pom.xml | 2 +- nifi-commons/nifi-jetty-configuration/pom.xml | 2 +- nifi-commons/nifi-json-utils/pom.xml | 4 +- nifi-commons/nifi-logging-utils/pom.xml| 2 +- nifi-commons/nifi-metrics/pom.xml | 4 +- nifi-commons/nifi-parameter/pom.xml| 4 +- nifi-commons/nifi-properties/pom.xml | 4 +- nifi-commons/nifi-property-encryptor/pom.xml | 6 +- nifi-commons/nifi-property-protection-api/pom.xml | 4 +- nifi-commons/nifi-property-protection-aws/pom.xml | 6 +- .../nifi-property
[nifi] 02/02: NIFI-11654 updating docker files
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit ec757b76942c4e6ff567acc87326c6eea90de69b
Author: Joe Witt
AuthorDate: Sun Jun 11 20:59:40 2023 -0400
NIFI-11654 updating docker files
---
minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt | 2 +-
minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile | 2 +-
minifi/minifi-docker/dockerhub/DockerImage.txt | 2 +-
minifi/minifi-docker/dockerhub/Dockerfile | 2 +-
nifi-docker/dockerhub/DockerImage.txt | 2 +-
nifi-docker/dockerhub/Dockerfile| 2 +-
nifi-docker/dockerhub/pom.xml | 2 +-
.../nifi-registry-core/nifi-registry-docker/dockerhub/Dockerfile| 2 +-
nifi-registry/nifi-registry-docker-maven/dockermaven/Dockerfile | 2 +-
nifi-toolkit/nifi-toolkit-assembly/docker/Dockerfile| 2 +-
nifi-toolkit/nifi-toolkit-assembly/docker/Dockerfile.hub| 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt
b/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt
index 22e180da52..11a0011b6f 100644
--- a/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt
+++ b/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apache/nifi-minifi-c2:1.22.0
+apache/nifi-minifi-c2:1.23.0
diff --git a/minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
b/minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
index 162441898c..3b846d4be3 100644
--- a/minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
+++ b/minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
@@ -22,7 +22,7 @@ LABEL site="https://nifi.apache.org;
ARG UID=1000
ARG GID=1000
-ARG MINIFI_C2_VERSION=1.22.0
+ARG MINIFI_C2_VERSION=1.23.0
ARG MIRROR=https://archive.apache.org/dist
ENV MINIFI_C2_BASE_DIR /opt/minifi-c2
diff --git a/minifi/minifi-docker/dockerhub/DockerImage.txt
b/minifi/minifi-docker/dockerhub/DockerImage.txt
index c7dd941e2b..328f77f722 100644
--- a/minifi/minifi-docker/dockerhub/DockerImage.txt
+++ b/minifi/minifi-docker/dockerhub/DockerImage.txt
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apache/nifi-minifi:1.22.0
+apache/nifi-minifi:1.23.0
diff --git a/minifi/minifi-docker/dockerhub/Dockerfile
b/minifi/minifi-docker/dockerhub/Dockerfile
index 522cc0a195..550c34a337 100644
--- a/minifi/minifi-docker/dockerhub/Dockerfile
+++ b/minifi/minifi-docker/dockerhub/Dockerfile
@@ -22,7 +22,7 @@ LABEL site="https://nifi.apache.org;
ARG UID=1000
ARG GID=1000
-ARG MINIFI_VERSION=1.22.0
+ARG MINIFI_VERSION=1.23.0
ARG MIRROR=https://archive.apache.org/dist
ENV MINIFI_BASE_DIR /opt/minifi
diff --git a/nifi-docker/dockerhub/DockerImage.txt
b/nifi-docker/dockerhub/DockerImage.txt
index 89577fdc7e..395597ab26 100644
--- a/nifi-docker/dockerhub/DockerImage.txt
+++ b/nifi-docker/dockerhub/DockerImage.txt
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apache/nifi:1.22.0
+apache/nifi:1.23.0
diff --git a/nifi-docker/dockerhub/Dockerfile b/nifi-docker/dockerhub/Dockerfile
index e6be61adba..6ac2d98442 100644
--- a/nifi-docker/dockerhub/Dockerfile
+++ b/nifi-docker/dockerhub/Dockerfile
@@ -25,7 +25,7 @@ LABEL site="https://nifi.apache.org;
ARG UID=1000
ARG GID=1000
-ARG NIFI_VERSION=1.22.0
+ARG NIFI_VERSION=1.23.0
ARG BASE_URL=https://archive.apache.org/dist
ARG MIRROR_BASE_URL=${MIRROR_BASE_URL:-${BASE_URL}}
ARG DISTRO_PATH=${DISTRO_PATH:-${NIFI_VERSION}}
diff --git a/nifi-docker/dockerhub/pom.xml b/nifi-docker/dockerhub/pom.xml
index af3be624ab..6d4614cb4a 100644
--- a/nifi-docker/dockerhub/pom.xml
+++ b/nifi-docker/dockerhub/pom.xml
@@ -23,7 +23,7 @@
-1.22.0
+1.23.0
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-docker/dockerhub/Dockerfile
b/nifi-registry/nifi-registry-core/nifi-registry-docker/dockerhub/Dockerfile
index 107f243c31..f2e926f810 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-docker/dockerhub/Dockerfile
+++ b/nifi-registry/nifi-registry-core/nifi-registry-docker/dockerhub/Dockerfile
@@ -22,7 +22,7 @@ LABEL site="https://nifi.apache.org;
ARG UID=1000
ARG GID=1000
-ARG NIFI_REGISTRY_VERSION=1.22.0
+ARG NIFI_REGISTRY_VERSION=1.23.0
ARG MIRROR=https://archive.apache.org/dist
ENV NIFI_REGISTRY_BASE_DIR /opt/nifi-registry
diff --git a/nifi-registry/nifi-registry-docker-maven/dockermaven/Dockerfile
b/nifi-registry/
[nifi] branch support/nifi-1.x updated (728b07b30f -> ec757b7694)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git from 728b07b30f NIFI-11675 Upgraded Apache Commons IO from 2.12.0 to 2.13.0 add 15ebf56a08 NIFI-11654 removing extraneous tag add 71e3ea9f2c NIFI-11654-RC1 prepare release nifi-1.22.0-RC1 add f1d5a8c4de NIFI-11654-RC1 prepare for next development iteration new edc9e40582 Merge branch 'NIFI-11654-RC1' into support/nifi-1.x new ec757b7694 NIFI-11654 updating docker files 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: c2/c2-client-bundle/c2-client-api/pom.xml | 4 +- c2/c2-client-bundle/c2-client-base/pom.xml | 6 +- c2/c2-client-bundle/c2-client-http/pom.xml | 8 +- c2/c2-client-bundle/c2-client-service/pom.xml | 8 +- c2/c2-client-bundle/pom.xml| 2 +- c2/c2-protocol/c2-protocol-api/pom.xml | 4 +- c2/c2-protocol/c2-protocol-component-api/pom.xml | 2 +- c2/c2-protocol/pom.xml | 2 +- c2/pom.xml | 4 +- minifi/minifi-assembly/pom.xml | 6 +- minifi/minifi-bootstrap/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-api/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-assembly/pom.xml| 2 +- .../minifi-c2-cache-filesystem/pom.xml | 2 +- .../minifi-c2-cache/minifi-c2-cache-s3/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-cache/pom.xml | 2 +- .../minifi-c2-docker/dockerhub/DockerImage.txt | 2 +- .../minifi-c2-docker/dockerhub/Dockerfile | 2 +- minifi/minifi-c2/minifi-c2-docker/pom.xml | 4 +- .../minifi-c2/minifi-c2-integration-tests/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-jetty/pom.xml | 2 +- .../minifi-c2-provider-cache/pom.xml | 2 +- .../minifi-c2-provider-delegating/pom.xml | 2 +- .../minifi-c2-provider-nifi-rest/pom.xml | 2 +- .../minifi-c2-provider-util/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-provider/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-service/pom.xml | 6 +- minifi/minifi-c2/pom.xml | 2 +- minifi/minifi-commons/minifi-commons-api/pom.xml | 2 +- .../minifi-commons/minifi-commons-schema/pom.xml | 2 +- minifi/minifi-commons/minifi-utils/pom.xml | 2 +- minifi/minifi-commons/pom.xml | 2 +- minifi/minifi-docker/dockerhub/DockerImage.txt | 2 +- minifi/minifi-docker/dockerhub/Dockerfile | 2 +- minifi/minifi-docker/pom.xml | 2 +- minifi/minifi-docs/pom.xml | 2 +- minifi/minifi-integration-tests/pom.xml| 2 +- .../minifi-framework-nar/pom.xml | 2 +- .../minifi-framework/minifi-framework-api/pom.xml | 8 +- .../minifi-framework/minifi-framework-core/pom.xml | 6 +- .../minifi-framework/minifi-resources/pom.xml | 2 +- .../minifi-framework/minifi-runtime/pom.xml| 2 +- .../minifi-framework/minifi-server/pom.xml | 2 +- .../minifi-framework/pom.xml | 2 +- .../minifi-server-nar/pom.xml | 8 +- .../minifi-framework-bundle/pom.xml| 20 +- .../minifi-provenance-repositories/pom.xml | 2 +- .../minifi-provenance-repository-nar/pom.xml | 2 +- .../minifi-provenance-repository-bundle/pom.xml| 2 +- .../minifi-nar-bundles/minifi-standard-nar/pom.xml | 8 +- .../minifi-update-attribute-nar/pom.xml| 6 +- minifi/minifi-nar-bundles/pom.xml | 2 +- .../minifi-toolkit/minifi-toolkit-assembly/pom.xml | 2 +- .../minifi-toolkit-configuration/pom.xml | 2 +- minifi/minifi-toolkit/pom.xml | 2 +- minifi/pom.xml | 148 - nifi-api/pom.xml | 2 +- nifi-assembly/pom.xml | 350 ++--- nifi-bootstrap/pom.xml | 24 +- nifi-commons/nifi-bootstrap-utils/pom.xml | 2 +- nifi-commons/nifi-build/pom.xml| 2 +- nifi-commons/nifi-data-provenance-utils/pom.xml| 8 +- nifi-commons/nifi-deprecation-log/pom.xml | 2 +- nifi-commons/nifi-expression-language/pom.xml | 10 +- nifi-commons/nifi-external-resource-utils/pom.xml | 4 +- nifi-commons/nifi-flow-encryptor/pom.xml | 6 +- nifi-commons/nifi-flowfile-packager/pom.xml| 2 +- nifi-commons/nifi-hashico
svn commit: r62366 - /dev/nifi/nifi-1.22.0/ /release/nifi/1.22.0/
Author: joewitt Date: Mon Jun 12 00:42:51 2023 New Revision: 62366 Log: NIFI-11654 Added: release/nifi/1.22.0/ - copied from r62365, dev/nifi/nifi-1.22.0/ Removed: dev/nifi/nifi-1.22.0/
