[nifi] branch main updated: NIFI-10100 Upgraded Jersey to 2.35
This is an automated email from the ASF dual-hosted git repository.
thenatog 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 bd45eb4995 NIFI-10100 Upgraded Jersey to 2.35
bd45eb4995 is described below
commit bd45eb4995ad661f5b524e08bb0f6785cf0cdfb0
Author: exceptionfactory
AuthorDate: Tue Jun 7 12:30:31 2022 -0500
NIFI-10100 Upgraded Jersey to 2.35
- Replaced individual version references with Jersey BOM dependency
Signed-off-by: Nathan Gough
This closes #6106.
---
minifi/minifi-c2/minifi-c2-assembly/pom.xml| 6 +--
minifi/minifi-c2/minifi-c2-jetty/pom.xml | 2 +-
minifi/minifi-c2/minifi-c2-service/pom.xml | 1 -
minifi/minifi-c2/pom.xml | 12 --
minifi/pom.xml | 16
nifi-commons/nifi-web-utils/pom.xml| 16
nifi-nar-bundles/nifi-ambari-bundle/pom.xml| 10 -
.../nifi-confluent-schema-registry-service/pom.xml | 2 -
nifi-nar-bundles/nifi-datadog-bundle/pom.xml | 5 ---
.../nifi-framework-nar/pom.xml | 1 -
.../nifi-framework/nifi-web/nifi-jetty/pom.xml | 4 +-
.../nifi-framework/nifi-web/nifi-web-api/pom.xml | 2 +-
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 44 --
.../nifi-yandex-processors/pom.xml | 3 --
.../nifi-site-to-site-reporting-bundle/pom.xml | 5 ---
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 21 ---
.../nifi-hwx-schema-registry-service/pom.xml | 4 --
.../nifi-update-attribute-ui/pom.xml | 17 -
.../nifi-registry-client/pom.xml | 5 ---
nifi-registry/nifi-registry-core/pom.xml | 5 ---
.../nifi-stateless-engine/pom.xml | 1 -
nifi-stateless/pom.xml | 5 ---
nifi-system-tests/nifi-system-test-suite/pom.xml | 1 -
nifi-toolkit/nifi-toolkit-admin/pom.xml| 3 --
nifi-toolkit/nifi-toolkit-cli/pom.xml | 2 -
nifi-toolkit/nifi-toolkit-tls/pom.xml | 2 -
pom.xml| 16 +++-
27 files changed, 19 insertions(+), 192 deletions(-)
diff --git a/minifi/minifi-c2/minifi-c2-assembly/pom.xml
b/minifi/minifi-c2/minifi-c2-assembly/pom.xml
index 148a6efe7b..957fa9146b 100644
--- a/minifi/minifi-c2/minifi-c2-assembly/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-assembly/pom.xml
@@ -139,23 +139,19 @@ limitations under the License.
org.glassfish.jersey.ext
-jersey-spring4
-${jersey.version}
+jersey-spring5
org.glassfish.jersey.containers
jersey-container-jetty-http
-${jersey.version}
org.glassfish.jersey.containers
jersey-container-servlet
-${jersey.version}
org.glassfish.jersey.core
jersey-client
-${jersey.version}
org.slf4j
diff --git a/minifi/minifi-c2/minifi-c2-jetty/pom.xml
b/minifi/minifi-c2/minifi-c2-jetty/pom.xml
index d5cbf8ff03..acf1fd5ca3 100644
--- a/minifi/minifi-c2/minifi-c2-jetty/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-jetty/pom.xml
@@ -33,7 +33,7 @@ limitations under the License.
org.glassfish.jersey.ext
-jersey-spring4
+jersey-spring5
org.glassfish.jersey.containers
diff --git a/minifi/minifi-c2/minifi-c2-service/pom.xml
b/minifi/minifi-c2/minifi-c2-service/pom.xml
index 97de3fb79e..a8e4a4bae1 100644
--- a/minifi/minifi-c2/minifi-c2-service/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-service/pom.xml
@@ -111,7 +111,6 @@ limitations under the License.
org.glassfish.jersey.core
jersey-server
-${jersey.version}
provided
diff --git a/minifi/minifi-c2/pom.xml b/minifi/minifi-c2/pom.xml
index 416d0cece4..a92ab7351c 100644
--- a/minifi/minifi-c2/pom.xml
+++ b/minifi/minifi-c2/pom.xml
@@ -35,16 +35,4 @@ limitations under the License.
minifi-c2-docker
minifi-c2-integration-tests
-
-
-
-
-org.glassfish.jersey
-jersey-bom
-${jersey.version}
-pom
-import
-
-
-
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 796d4003a7..583fc40f4f 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -40,7 +40,6 @@ limitations under the License.
minifi-integration-tests
-2.29
1.19.0
1.11.172
2.2.0
@@ -764,21 +763,6 @@ limitations under the License.
org.apache.avro
avro
[nifi] branch main updated: NIFI-10104 Refactored usage of PropertyEncryptor
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 2161d0fe9c NIFI-10104 Refactored usage of PropertyEncryptor
2161d0fe9c is described below
commit 2161d0fe9c2c91e424507779d46983aea142b2e0
Author: Emilio Setiadarma
AuthorDate: Fri Jun 10 10:33:13 2022 -0700
NIFI-10104 Refactored usage of PropertyEncryptor
This closes #6119
Signed-off-by: David Handermann
---
.../org/apache/nifi/cluster/integration/Node.java | 2 +-
.../org/apache/nifi/controller/FlowController.java | 10 +--
.../nifi/controller/StandardFlowService.java | 12 ++--
.../nifi/controller/XmlFlowSynchronizer.java | 29 +
.../AbstractTimeBasedSchedulingAgent.java | 12 ++--
.../scheduling/QuartzSchedulingAgent.java | 7 +--
.../scheduling/StandardProcessScheduler.java | 16 ++---
.../scheduling/TimerDrivenSchedulingAgent.java | 7 +--
.../controller/serialization/FlowSynchronizer.java | 4 +-
.../serialization/StandardFlowSerializer.java | 38 +--
.../serialization/StandardFlowSynchronizer.java| 7 +--
.../serialization/VersionedFlowSerializer.java | 7 +--
.../serialization/VersionedFlowSynchronizer.java | 73 +++---
.../nifi/controller/tasks/ConnectableTask.java | 6 +-
.../persistence/StandardFlowConfigurationDAO.java | 19 +++---
.../spring/StandardFlowServiceFactoryBean.java | 2 -
.../nifi/controller/StandardFlowServiceTest.java | 12 ++--
.../nifi/controller/StandardProcessorNodeIT.java | 2 +-
.../apache/nifi/controller/TestFlowController.java | 46 +-
.../scheduling/TestStandardProcessScheduler.java | 4 +-
.../serialization/StandardFlowSerializerTest.java | 2 +-
.../StandardControllerServiceProviderIT.java | 2 +-
.../TestStandardControllerServiceProvider.java | 2 +-
.../nifi/controller/tasks/TestConnectableTask.java | 4 +-
.../nifi/fingerprint/FingerprintFactoryTest.java | 6 +-
.../nifi/integration/FrameworkIntegrationTest.java | 8 +--
.../apache/nifi/headless/HeadlessNiFiServer.java | 1 -
.../nifi/web/StandardNiFiServiceFacadeSpec.groovy | 1 -
28 files changed, 153 insertions(+), 188 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/integration/Node.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/integration/Node.java
index 5e239b25db..2000e36c28 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/integration/Node.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/integration/Node.java
@@ -174,7 +174,7 @@ public class Node {
flowController.getStateManagerProvider().getStateManager("Cluster
Node Configuration").setState(Collections.singletonMap("Node UUID",
nodeId.getId()), Scope.LOCAL);
flowService =
StandardFlowService.createClusteredInstance(flowController, nodeProperties,
senderListener, clusterCoordinator,
-PropertyEncryptorFactory.getPropertyEncryptor(nodeProperties),
revisionManager, Mockito.mock(Authorizer.class));
+revisionManager, Mockito.mock(Authorizer.class));
flowService.start();
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
index ec5e438dc6..32616e8c8e 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -544,7 +544,7 @@ public class FlowController implements
ReportingTaskProvider, Authorizable, Node
throw new RuntimeException(e);
}
-processScheduler = new
StandardProcessScheduler(timerDrivenEngineRef.get(), this, encryptor,
stateManagerProvider, this.nifiProperties);
+processScheduler = new
StandardProcessScheduler(timerDrivenEngineRef.get(), this,
stateManagerProvider, this.nifiProperties);
eventDrivenWorkerQueue = new EventDrivenWorkerQueue(false, false,
processScheduler);
parameterContextManager = new StandardParameterContextManager();
@@ -559,8 +559,8 @@ public class FlowController implements
ReportingTaskProvider, Authorizable, Node
repositoryContextFactory,
[nifi-maven] annotated tag nifi-nar-maven-plugin-1.3.4-RC1 updated (c4d9563 -> 6f7ab62)
This is an automated email from the ASF dual-hosted git repository. kdoran pushed a change to annotated tag nifi-nar-maven-plugin-1.3.4-RC1 in repository https://gitbox.apache.org/repos/asf/nifi-maven.git *** WARNING: tag nifi-nar-maven-plugin-1.3.4-RC1 was modified! *** from c4d9563 (commit) to 6f7ab62 (tag) tagging c4d9563bff2b5c2120e7f1e181343e2c01cc0422 (commit) replaces rel/nifi-nar-maven-plugin-1.3.3 by Kevin Doran on Thu Jun 16 16:22:00 2022 -0400 - Log - NIFI-10131-RC1 copy for tag nifi-nar-maven-plugin-1.3.4-RC1 --- No new revisions were added by this update. Summary of changes:
svn commit: r55168 - /dev/nifi/nifi-nar-maven-plugin-1.3.4/
Author: kdoran Date: Thu Jun 16 20:47:18 2022 New Revision: 55168 Log: NIFI-10131 Staging artifacts for nifi-nar-maven-plugin-1.3.4-RC1 Added: dev/nifi/nifi-nar-maven-plugin-1.3.4/ dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip (with props) dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.asc dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.sha256 dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.sha512 Added: dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip == Binary file - no diff available. Propchange: dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.asc == --- dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.asc (added) +++ dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.asc Thu Jun 16 20:47:18 2022 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEwJuoka7UW4wsIxr+H7ZqkfcbYgcFAmKrlCoACgkQH7Zqkfcb +YgemlhAAmqpezgCnYE+Xb6k6wBMX+4qWlzjiTBUIgQnzq/kuCp+ug/VthT213Qo+ +ACV5mYxDWaj/NpQK4t1mLT4/dp4zreriljW2grVI4O/R5AULgnZyaI68jNyj9Msf +1LyegLrcV94ZXLc7vYUDHl2CNYF9osxsvFnUgg+UjI2Ay6LnRWvTYoXvXKr2lDcZ +x0Qyi2of/vd5N4xvCgjb19X4RPiApR0KwgloLllV91GGlGwEfjlRhafWzPYOFh6r +XChZwD8jUnq5cs0CkJIwrOnuGm4qz7oane5QUWj8MhoiBQ288eUl3QVV9iQBz4jV +D+35pcO/1LUnjTbqR9MRyeNUj6QWNcIWCgAEsU7zeIJClvCn10S9KPYcejUJW4xb +J7i+O27w8pzFXgQ4prwaVD5xgMX9Zcoei43ey7OdPwB1idoEbhON6RBcXveRUOxp +/lzz8NwSGSQCsY2xvuZyT5NAItZqXxQVvY3qUM33hhKJMiMPTLfPkI6uc2rUzgeP +uZj1ZkdQP6etxK29GGJyiDnO48dkOcKBJ6GYEqQ7Z64epr7lTH5h6BtmhN0VYs5e +ArTjFb7cuuVglXTX2806Hvqgo5izuT5YSGKZIPWiB2rUDCMk3onIlNRoeH6ttXMG +cCplGlTuZ1xuRKUgXmPmNQ61M0igPSoYNAgAbSAqmTJc9oWj/oE= +=P7VH +-END PGP SIGNATURE- Added: dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.sha256 == --- dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.sha256 (added) +++ dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.sha256 Thu Jun 16 20:47:18 2022 @@ -0,0 +1 @@ +acee55a767b9c90c8884e8c6e5fe936088243f778dc7e1de6f281cd4c8a85cab Added: dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.sha512 == --- dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.sha512 (added) +++ dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.sha512 Thu Jun 16 20:47:18 2022 @@ -0,0 +1 @@ +267cc157117d179517257f47c8d92f3dc5e594b230bb019ccc6e2cb2884b450af56603214fa651bc33aceb3bf0bdb9369aa779672cb3f6f0efd2bacb166f9051
[nifi-maven] 01/02: NIFI-10131-RC1 prepare release nifi-nar-maven-plugin-1.3.4-RC1
This is an automated email from the ASF dual-hosted git repository. kdoran pushed a commit to branch NIFI-10131-RC1 in repository https://gitbox.apache.org/repos/asf/nifi-maven.git commit c4d9563bff2b5c2120e7f1e181343e2c01cc0422 Author: Kevin Doran AuthorDate: Thu Jun 16 16:21:56 2022 -0400 NIFI-10131-RC1 prepare release nifi-nar-maven-plugin-1.3.4-RC1 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index aa7c933..10b9e4a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.nifi nifi-nar-maven-plugin -1.3.4-SNAPSHOT +1.3.4 maven-plugin Apache NiFi Nar Maven Plugin http://nifi.apache.org @@ -67,7 +67,7 @@ scm:git:git://git.apache.org/nifi-maven.git scm:git:https://git-wip-us.apache.org/repos/asf/nifi-maven.git https://git-wip-us.apache.org/repos/asf?p=nifi-maven.git -HEAD +nifi-nar-maven-plugin-1.3.4-RC1 JIRA @@ -79,7 +79,7 @@ 3.1.0 UTF-8 UTF-8 - 2022-02-17T22:08:13Z + 2022-06-16T20:21:48Z 2014
[nifi-maven] branch NIFI-10131-RC1 created (now d707f03)
This is an automated email from the ASF dual-hosted git repository. kdoran pushed a change to branch NIFI-10131-RC1 in repository https://gitbox.apache.org/repos/asf/nifi-maven.git at d707f03 NIFI-10131-RC1 prepare for next development iteration This branch includes the following new commits: new c4d9563 NIFI-10131-RC1 prepare release nifi-nar-maven-plugin-1.3.4-RC1 new d707f03 NIFI-10131-RC1 prepare for next development iteration 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.
[nifi-maven] 02/02: NIFI-10131-RC1 prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. kdoran pushed a commit to branch NIFI-10131-RC1 in repository https://gitbox.apache.org/repos/asf/nifi-maven.git commit d707f0391726e405c5dd347cce3a51bdd6e1bd81 Author: Kevin Doran AuthorDate: Thu Jun 16 16:22:00 2022 -0400 NIFI-10131-RC1 prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 10b9e4a..d64ad31 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.nifi nifi-nar-maven-plugin -1.3.4 +1.3.5-SNAPSHOT maven-plugin Apache NiFi Nar Maven Plugin http://nifi.apache.org @@ -67,7 +67,7 @@ scm:git:git://git.apache.org/nifi-maven.git scm:git:https://git-wip-us.apache.org/repos/asf/nifi-maven.git https://git-wip-us.apache.org/repos/asf?p=nifi-maven.git -nifi-nar-maven-plugin-1.3.4-RC1 +HEAD JIRA @@ -79,7 +79,7 @@ 3.1.0 UTF-8 UTF-8 - 2022-06-16T20:21:48Z + 2022-06-16T20:22:00Z 2014
[nifi] branch main updated: NIFI-10116 Added CLI toolkit command to delete report tasks
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 a30ac23e90 NIFI-10116 Added CLI toolkit command to delete report tasks
a30ac23e90 is described below
commit a30ac23e90cb1471735a0b423e6e425c2619c153
Author: Zoltan Kornel Torok
AuthorDate: Tue Jun 14 15:06:13 2022 +0200
NIFI-10116 Added CLI toolkit command to delete report tasks
This closes #6126
Signed-off-by: David Handermann
---
nifi-docs/src/main/asciidoc/toolkit-guide.adoc | 3 +-
.../cli/impl/command/nifi/NiFiCommandGroup.java| 2 +
.../nifi/reporting/DeleteReportingTask.java| 65 ++
3 files changed, 69 insertions(+), 1 deletion(-)
diff --git a/nifi-docs/src/main/asciidoc/toolkit-guide.adoc
b/nifi-docs/src/main/asciidoc/toolkit-guide.adoc
index 631839383b..6ccb0d65f4 100644
--- a/nifi-docs/src/main/asciidoc/toolkit-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/toolkit-guide.adoc
@@ -110,6 +110,7 @@ The following are available commands:
nifi get-reporting-task
nifi get-reporting-tasks
nifi create-reporting-task
+ nifi delete-reporting-task
nifi set-param
nifi delete-param
nifi list-param-contexts
@@ -293,7 +294,7 @@ Typing "nifi " and then a tab will show the sub-commands
for NiFi:
delete-paramget-service pg-get-param-context
update-reg-client
delete-param-contextget-servicespg-get-services
update-user-group
disable-servicesimport-param-contextpg-get-vars
upload-template
- disconnect-node list-param-contexts pg-get-version
+ disconnect-node list-param-contexts pg-get-version
delete-reporting-task
download-template list-reg-clientspg-import
Arguments that represent a path to a file, such as `-p` or when setting a
properties file in the session, will auto-complete the path being typed:
diff --git
a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/NiFiCommandGroup.java
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/NiFiCommandGroup.java
index af007d4451..e8f71c713b 100644
---
a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/NiFiCommandGroup.java
+++
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/NiFiCommandGroup.java
@@ -74,6 +74,7 @@ import
org.apache.nifi.toolkit.cli.impl.command.nifi.registry.CreateRegistryClie
import
org.apache.nifi.toolkit.cli.impl.command.nifi.registry.GetRegistryClientId;
import
org.apache.nifi.toolkit.cli.impl.command.nifi.registry.ListRegistryClients;
import
org.apache.nifi.toolkit.cli.impl.command.nifi.registry.UpdateRegistryClient;
+import
org.apache.nifi.toolkit.cli.impl.command.nifi.reporting.DeleteReportingTask;
import
org.apache.nifi.toolkit.cli.impl.command.nifi.templates.DownloadTemplate;
import org.apache.nifi.toolkit.cli.impl.command.nifi.templates.ListTemplates;
import org.apache.nifi.toolkit.cli.impl.command.nifi.templates.UploadTemplate;
@@ -140,6 +141,7 @@ public class NiFiCommandGroup extends AbstractCommandGroup {
commands.add(new GetReportingTasks());
commands.add(new GetReportingTask());
commands.add(new CreateReportingTask());
+commands.add(new DeleteReportingTask());
commands.add(new StartReportingTasks());
commands.add(new StopReportingTasks());
commands.add(new ListUsers());
diff --git
a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/reporting/DeleteReportingTask.java
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/reporting/DeleteReportingTask.java
new file mode 100644
index 00..27ee27c8bd
--- /dev/null
+++
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/reporting/DeleteReportingTask.java
@@ -0,0 +1,65 @@
+/*
+ * 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.
+
[nifi-maven] branch main updated: NIFI-10131 Update NOTICE file for 2022
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-maven.git The following commit(s) were added to refs/heads/main by this push: new 37e6cb7 NIFI-10131 Update NOTICE file for 2022 new b0b02bc Merge pull request #19 from kevdoran/NIFI-10131-update-year-in-notice-file 37e6cb7 is described below commit 37e6cb7926a74275e36a801714b09a18eee92a19 Author: Kevin Doran AuthorDate: Thu Jun 16 15:36:29 2022 -0400 NIFI-10131 Update NOTICE file for 2022 --- NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index 6ca9f09..ceeca81 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache NiFi -Copyright 2014-2021 The Apache Software Foundation +Copyright 2014-2022 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
[nifi] branch main updated: NIFI-10122 Upgraded Spark Streaming to 3.3.0
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 6a285c67e5 NIFI-10122 Upgraded Spark Streaming to 3.3.0
6a285c67e5 is described below
commit 6a285c67e54b5977f19b36ccbe1a685f4edaa8c1
Author: exceptionfactory
AuthorDate: Wed Jun 15 15:15:01 2022 -0500
NIFI-10122 Upgraded Spark Streaming to 3.3.0
- Added false positive vulnerability suppression for Spark modules
Signed-off-by: Pierre Villard
This closes #6130.
---
nifi-dependency-check-maven/suppressions.xml | 5 +++
nifi-external/nifi-spark-receiver/pom.xml| 52 ++--
2 files changed, 15 insertions(+), 42 deletions(-)
diff --git a/nifi-dependency-check-maven/suppressions.xml
b/nifi-dependency-check-maven/suppressions.xml
index a48534c8f8..a1f15c36d2 100644
--- a/nifi-dependency-check-maven/suppressions.xml
+++ b/nifi-dependency-check-maven/suppressions.xml
@@ -94,4 +94,9 @@
^pkg:maven/org\.mortbay\.jetty/servlet\-api@.*$
^cpe:.*$
+
+Spark 2.13 used in nifi-spark-receiver is not impacted by Spark
Server vulnerabilities
+^pkg:maven/org\.apache\.spark/spark\-.+?_2\.13@.*$
+cpe:/a:apache:spark
+
diff --git a/nifi-external/nifi-spark-receiver/pom.xml
b/nifi-external/nifi-spark-receiver/pom.xml
index 531fa13582..adfd8c292c 100644
--- a/nifi-external/nifi-spark-receiver/pom.xml
+++ b/nifi-external/nifi-spark-receiver/pom.xml
@@ -22,47 +22,20 @@
org.apache.nifi
nifi-spark-receiver
-
-
-
-
-org.apache.commons
-commons-compress
-1.21
-
-
-
-commons-beanutils
-commons-beanutils
-1.9.4
-
-
-
-org.apache.zookeeper
-zookeeper
-${zookeeper.version}
-
-
-io.netty
-netty
-${netty.3.version}
-
-
-
org.apache.spark
-spark-streaming_2.10
+spark-streaming_2.13
provided
-1.6.0
+3.3.0
-log4j
-log4j
+commons-logging
+commons-logging
-org.slf4j
-slf4j-log4j12
+org.apache.logging.log4j
+log4j-core
@@ -70,19 +43,14 @@
org.slf4j
log4j-over-slf4j
+
+org.slf4j
+jcl-over-slf4j
+
org.apache.nifi
nifi-site-to-site-client
1.17.0-SNAPSHOT
-
-com.sun.jersey
-jersey-server
-1.2
-
-
-com.fasterxml.jackson.core
-jackson-databind
-
