[nifi] branch main updated: NIFI-11114 Thise closes #6906. Upgraded OWASP Dependency Check from 7.4.4 to 8.0.2
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 bda1bd326d NIFI-4 Thise closes #6906. Upgraded OWASP Dependency
Check from 7.4.4 to 8.0.2
bda1bd326d is described below
commit bda1bd326d3b4b097bdbb9bb70f9c01479ff7759
Author: exceptionfactory
AuthorDate: Mon Jan 30 13:40:09 2023 -0600
NIFI-4 Thise closes #6906. Upgraded OWASP Dependency Check from 7.4.4
to 8.0.2
- Added jetty-jmx to managed dependencies to maintain aligned versions
Signed-off-by: Joe Witt
---
nifi-dependency-check-maven/suppressions.xml | 21 ++---
pom.xml | 7 ++-
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/nifi-dependency-check-maven/suppressions.xml
b/nifi-dependency-check-maven/suppressions.xml
index ee73d03bb0..fd17ad5457 100644
--- a/nifi-dependency-check-maven/suppressions.xml
+++ b/nifi-dependency-check-maven/suppressions.xml
@@ -180,8 +180,23 @@
^cpe:/a:elastic.*$
-HTTP server vulnerabilities do not apply to Apache FTP
Server
-^pkg:maven/org\.apache\.ftpserver/.*$
-cpe:/a:apache:apache_http_server
+CVE-2022-45046 description notes that the initial issue was not
a security vulnerability
+^pkg:maven/org\.apache\.camel/camel\-salesforce@.*$
+CVE-2022-45046
+
+
+CVE-2020-36632 applies to JavaScript module named hughsk/flat
not flatbuffers
+^pkg:maven/com\.vlkan/flatbuffers@.*$
+CVE-2020-36632
+
+
+CVE-2018-8015 applies to Apache ORC not to Apache
Iceberg
+^pkg:maven/org\.apache\.iceberg/iceberg\-orc@.*$
+CVE-2018-8015
+
+
+CVE-2022-39135 applies to Calcite not Calcite Avatica
+^pkg:maven/org\.apache\.calcite\.avatica/.*?@.*$
+CVE-2022-39135
diff --git a/pom.xml b/pom.xml
index 44ae66f326..6115b3be61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -512,6 +512,11 @@
jetty-util-ajax
${jetty.version}
+
+org.eclipse.jetty
+jetty-jmx
+${jetty.version}
+
org.eclipse.jetty.http2
http2-client
@@ -1190,7 +1195,7 @@
org.owasp
dependency-check-maven
-7.4.4
+8.0.2
false
[nifi-maven] branch NIFI-10906-RC1 created (now 08be9cd)
This is an automated email from the ASF dual-hosted git repository. kdoran pushed a change to branch NIFI-10906-RC1 in repository https://gitbox.apache.org/repos/asf/nifi-maven.git at 08be9cd NIFI-10906-RC1 prepare for next development iteration This branch includes the following new commits: new 09d7bb9 NIFI-10906-RC1 prepare release nifi-nar-maven-plugin-1.4.0-RC1 new 08be9cd NIFI-10906-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] 01/02: NIFI-10906-RC1 prepare release nifi-nar-maven-plugin-1.4.0-RC1
This is an automated email from the ASF dual-hosted git repository. kdoran pushed a commit to branch NIFI-10906-RC1 in repository https://gitbox.apache.org/repos/asf/nifi-maven.git commit 09d7bb9ff679d0eed9feaa066d2cbdd347a20204 Author: Kevin Doran AuthorDate: Mon Jan 30 17:57:29 2023 -0500 NIFI-10906-RC1 prepare release nifi-nar-maven-plugin-1.4.0-RC1 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b2ca352..c9094a5 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.nifi nifi-nar-maven-plugin -1.4.0-SNAPSHOT +1.4.0 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.4.0-RC1 JIRA @@ -79,7 +79,7 @@ 3.1.0 UTF-8 UTF-8 - 2022-11-29T21:10:17Z + 2023-01-30T22:55:12Z 2014
[nifi-maven] 02/02: NIFI-10906-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-10906-RC1 in repository https://gitbox.apache.org/repos/asf/nifi-maven.git commit 08be9cd031155fc78ffa1dcfcd05553631a8bc31 Author: Kevin Doran AuthorDate: Mon Jan 30 17:57:33 2023 -0500 NIFI-10906-RC1 prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c9094a5..a578b83 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.nifi nifi-nar-maven-plugin -1.4.0 +1.4.1-SNAPSHOT maven-plugin Apache NiFi Nar Maven Plugin http://nifi.apache.org @@ -79,7 +79,7 @@ 3.1.0 UTF-8 UTF-8 - 2023-01-30T22:55:12Z + 2023-01-30T22:57:33Z 2014
[nifi-maven] branch main updated: NIFI-10906 Update NOTICE file for 2023
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-maven.git The following commit(s) were added to refs/heads/main by this push: new 88b3e37 NIFI-10906 Update NOTICE file for 2023 new 794333f Merge pull request #28 from kevdoran/NIFI-10906-update-notice-year 88b3e37 is described below commit 88b3e378431c6d34768239c918efb1e13d1fcd40 Author: Kevin Doran AuthorDate: Mon Jan 30 17:48:40 2023 -0500 NIFI-10906 Update NOTICE file for 2023 --- NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index ceeca81..1ba22b7 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache NiFi -Copyright 2014-2022 The Apache Software Foundation +Copyright 2014-2023 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
[nifi] branch main updated: NIFI-11113 This closes #6905. Upgraded ZooKeeper from 3.8.0 to 3.8.1
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 a1072140a1 NIFI-3 This closes #6905. Upgraded ZooKeeper from 3.8.0 to 3.8.1 a1072140a1 is described below commit a1072140a1a8f655f4c075842b2473aaa9e787ac Author: exceptionfactory AuthorDate: Mon Jan 30 09:07:59 2023 -0600 NIFI-3 This closes #6905. Upgraded ZooKeeper from 3.8.0 to 3.8.1 Signed-off-by: Joe Witt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bde25c3491..44ae66f326 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 5.8.0 1.6.6 2.1.214 -3.8.0 +3.8.1
[nifi-minifi-cpp] 02/03: MINIFICPP-2008 Differentiate successful onTriggers from throwing onTriggers in ScheduleAgents
This is an automated email from the ASF dual-hosted git repository.
adebreceni pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 9f2040abc6d66602e82a2c1c0ac708ddfe9f6570
Author: Martin Zink
AuthorDate: Mon Jan 30 11:13:51 2023 +0100
MINIFICPP-2008 Differentiate successful onTriggers from throwing onTriggers
in ScheduleAgents
Signed-off-by: Adam Debreceni
This closes #1474
---
libminifi/include/CronDrivenSchedulingAgent.h | 2 --
libminifi/include/EventDrivenSchedulingAgent.h | 25 +++
libminifi/include/SchedulingAgent.h| 18 ++---
libminifi/include/ThreadedSchedulingAgent.h| 26 +++-
libminifi/include/TimerDrivenSchedulingAgent.h | 27 +++--
libminifi/src/CronDrivenSchedulingAgent.cpp| 17 +++-
libminifi/src/EventDrivenSchedulingAgent.cpp | 16 +++
libminifi/src/SchedulingAgent.cpp | 28 --
libminifi/src/TimerDrivenSchedulingAgent.cpp | 23 +
9 files changed, 47 insertions(+), 135 deletions(-)
diff --git a/libminifi/include/CronDrivenSchedulingAgent.h
b/libminifi/include/CronDrivenSchedulingAgent.h
index 3595f302f..88ee42e6b 100644
--- a/libminifi/include/CronDrivenSchedulingAgent.h
+++ b/libminifi/include/CronDrivenSchedulingAgent.h
@@ -45,8 +45,6 @@ class CronDrivenSchedulingAgent : public
ThreadedSchedulingAgent {
: ThreadedSchedulingAgent(controller_service_provider, std::move(repo),
std::move(flow_repo), std::move(content_repo), std::move(configuration),
thread_pool) {
}
- CronDrivenSchedulingAgent(const CronDrivenSchedulingAgent& parent) = delete;
- CronDrivenSchedulingAgent& operator=(const CronDrivenSchedulingAgent&
parent) = delete;
~CronDrivenSchedulingAgent() override = default;
utils::TaskRescheduleInfo run(core::Processor *processor,
diff --git a/libminifi/include/EventDrivenSchedulingAgent.h
b/libminifi/include/EventDrivenSchedulingAgent.h
index e9439a925..d017da38c 100644
--- a/libminifi/include/EventDrivenSchedulingAgent.h
+++ b/libminifi/include/EventDrivenSchedulingAgent.h
@@ -17,8 +17,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef LIBMINIFI_INCLUDE_EVENTDRIVENSCHEDULINGAGENT_H_
-#define LIBMINIFI_INCLUDE_EVENTDRIVENSCHEDULINGAGENT_H_
+#pragma once
#include
#include
@@ -31,18 +30,10 @@
#include "core/ProcessSessionFactory.h"
#include "ThreadedSchedulingAgent.h"
-namespace org {
-namespace apache {
-namespace nifi {
-namespace minifi {
+namespace org::apache::nifi::minifi {
-// EventDrivenSchedulingAgent Class
class EventDrivenSchedulingAgent : public ThreadedSchedulingAgent {
public:
- // Constructor
- /*!
- * Create a new event driven scheduling agent.
- */
EventDrivenSchedulingAgent(const
gsl::not_null
controller_service_provider, std::shared_ptr repo,
std::shared_ptr flow_repo,
std::shared_ptr content_repo,
std::shared_ptr configuration,
utils::ThreadPool
&thread_pool)
@@ -56,21 +47,11 @@ class EventDrivenSchedulingAgent : public
ThreadedSchedulingAgent {
void schedule(core::Processor* processor) override;
- // Run function for the thread
utils::TaskRescheduleInfo run(core::Processor* processor, const
std::shared_ptr &processContext,
const std::shared_ptr &sessionFactory)
override;
private:
- // Prevent default copy constructor and assignment operation
- // Only support pass by reference or pointer
- EventDrivenSchedulingAgent(const EventDrivenSchedulingAgent &parent);
- EventDrivenSchedulingAgent &operator=(const EventDrivenSchedulingAgent
&parent);
-
std::chrono::milliseconds time_slice_;
};
-} // namespace minifi
-} // namespace nifi
-} // namespace apache
-} // namespace org
-#endif // LIBMINIFI_INCLUDE_EVENTDRIVENSCHEDULINGAGENT_H_
+} // namespace org::apache::nifi::minifi
diff --git a/libminifi/include/SchedulingAgent.h
b/libminifi/include/SchedulingAgent.h
index 24992c928..968d03860 100644
--- a/libminifi/include/SchedulingAgent.h
+++ b/libminifi/include/SchedulingAgent.h
@@ -30,6 +30,7 @@
#include
#include
#include "utils/CallBackTimer.h"
+#include "utils/expected.h"
#include "utils/Monitors.h"
#include "utils/TimeUtil.h"
#include "utils/ThreadPool.h"
@@ -49,7 +50,6 @@
namespace org::apache::nifi::minifi {
-// SchedulingAgent Class
class SchedulingAgent {
public:
// Constructor
@@ -87,14 +87,15 @@ class SchedulingAgent {
logger_->log_trace("Destroying scheduling agent");
}
- // onTrigger, return whether the yield is need
- bool onTrigger(core::Processor* processor, const
std::shared_ptr &processContext, const
std::shared_ptr &sessionFactory);
- // start
+ nonstd::expected onTrigger(core::Processor*
processor,
+ const std::shared_ptr& process
[nifi-minifi-cpp] 03/03: MINIFICPP-2036 Upgrade gcc to version 11
This is an automated email from the ASF dual-hosted git repository.
adebreceni pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 169cd68226a69c9815abedc174cc6713ba9bc957
Author: Ferenc Gerlits
AuthorDate: Mon Jan 30 11:15:38 2023 +0100
MINIFICPP-2036 Upgrade gcc to version 11
- on centos: use devtoolset-11 instead of devtoolset-10
- on alpine: use version 3.16 instead of 3.13
- on both: do not install the boost package, as it is no longer required
Signed-off-by: Adam Debreceni
This closes #1495
---
README.md| 2 +-
centos.sh| 4 ++--
docker/Dockerfile| 3 ++-
docker/centos/Dockerfile | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 096cea87d..9a19458ea 100644
--- a/README.md
+++ b/README.md
@@ -117,7 +117,7 @@ Through JNI extensions you can run NiFi processors using
NARs. The JNI extension
Utilities
* CMake 3.17 or greater
-* gcc 10 or greater
+* gcc 11 or greater
* bison 3.0.x+ (3.2 has been shown to fail builds)
* flex 2.6 or greater
diff --git a/centos.sh b/centos.sh
index a01482273..279275604 100644
--- a/centos.sh
+++ b/centos.sh
@@ -18,8 +18,8 @@
get_toolset_name() {
case "$OS_MAJOR" in
-7) TOOLSET_NAME=devtoolset-10 ;;
-8) TOOLSET_NAME=gcc-toolset-10 ;;
+7) TOOLSET_NAME=devtoolset-11 ;;
+8) TOOLSET_NAME=gcc-toolset-12 ;;
9) TOOLSET_NAME=gcc-toolset-12 ;;
esac
}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 58bf2a3a6..d5bdb0117 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -16,7 +16,7 @@
# under the License.
#
-ARG BASE_ALPINE_IMAGE="alpine:3.13"
+ARG BASE_ALPINE_IMAGE="alpine:3.16"
# Build image
FROM ${BASE_ALPINE_IMAGE} AS build
@@ -36,6 +36,7 @@ ARG DOCKER_SKIP_TESTS=ON
RUN apk --no-cache add gcc \
g++ \
make \
+ bash \
bison \
flex \
flex-dev \
diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
index e426acfda..7b8307bf4 100644
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -57,7 +57,7 @@ USER ${USER}
# Perform the build
RUN cd $MINIFI_BASE_DIR && \
cd build && \
-source /opt/rh/devtoolset-10/enable && \
+source /opt/rh/devtoolset-11/enable && \
export PATH=/usr/lib64/ccache${PATH:+:${PATH}} && \
cmake3 -DSTATIC_BUILD= -DSKIP_TESTS=${DOCKER_SKIP_TESTS} ${MINIFI_OPTIONS}
-DAWS_ENABLE_UNITY_BUILD=OFF -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" .. && \
make -j "$(nproc)" package
[nifi-minifi-cpp] 01/03: MINIFICPP-1983 Modify correct minifi.properties file for test containers
This is an automated email from the ASF dual-hosted git repository.
adebreceni pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 41775606425a9382c7733db066f2c5d732b93344
Author: Gabor Gyimesi
AuthorDate: Mon Jan 30 11:11:17 2023 +0100
MINIFICPP-1983 Modify correct minifi.properties file for test containers
Signed-off-by: Adam Debreceni
This closes #1496
---
docker/test/integration/cluster/containers/MinifiContainer.py | 7 ---
docker/test/integration/resources/minifi-c2-server-ssl/config.yml | 8
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/docker/test/integration/cluster/containers/MinifiContainer.py
b/docker/test/integration/cluster/containers/MinifiContainer.py
index f5dde6a62..93d65ddda 100644
--- a/docker/test/integration/cluster/containers/MinifiContainer.py
+++ b/docker/test/integration/cluster/containers/MinifiContainer.py
@@ -65,7 +65,7 @@ class MinifiContainer(FlowContainer):
config_file.write(test_flow_yaml.encode('utf-8'))
def _create_properties(self):
-properties_file_path = os.path.join(self.config_dir,
'minifi.properties')
+properties_file_path =
os.path.join(self.container_specific_config_dir, 'minifi.properties')
with open(properties_file_path, 'a') as f:
if self.options.enable_c2:
f.write("nifi.c2.enable=true\n")
@@ -82,6 +82,7 @@ class MinifiContainer(FlowContainer):
f.write("nifi.c2.rest.url.ack=https://minifi-c2-server:10090/c2/config/acknowledge\n";)
f.write("nifi.c2.rest.ssl.context.service=SSLContextService\n")
f.write("nifi.c2.flow.base.url=https://minifi-c2-server:10090/c2/config/\n";)
+
f.write("nifi.c2.root.classes=DeviceInfoNode,AgentInformation,FlowInformation\n")
f.write("nifi.c2.full.heartbeat=false\n")
f.write("nifi.c2.agent.class=minifi-test-class\n")
f.write("nifi.c2.agent.identifier=minifi-test-id\n")
@@ -99,9 +100,9 @@ class MinifiContainer(FlowContainer):
self._create_config()
self._create_properties()
-self.vols[os.path.join(self.config_dir, 'minifi.properties')] =
{"bind": os.path.join(MinifiContainer.MINIFI_ROOT, 'conf',
'minifi.properties'), "mode": "rw"}
+self.vols[os.path.join(self.container_specific_config_dir,
'minifi.properties')] = {"bind": os.path.join(MinifiContainer.MINIFI_ROOT,
'conf', 'minifi.properties'), "mode": "rw"}
self.vols[os.path.join(self.container_specific_config_dir,
'config.yml')] = {"bind": os.path.join(MinifiContainer.MINIFI_ROOT, 'conf',
'config.yml'), "mode": "rw"}
-self.vols[os.path.join(self.config_dir, 'minifi-log.properties')] =
{"bind": os.path.join(MinifiContainer.MINIFI_ROOT, 'conf',
'minifi-log.properties'), "mode": "rw"}
+self.vols[os.path.join(self.container_specific_config_dir,
'minifi-log.properties')] = {"bind": os.path.join(MinifiContainer.MINIFI_ROOT,
'conf', 'minifi-log.properties'), "mode": "rw"}
def deploy(self):
if not self.set_deployed():
diff --git a/docker/test/integration/resources/minifi-c2-server-ssl/config.yml
b/docker/test/integration/resources/minifi-c2-server-ssl/config.yml
index d4c69534c..239541288 100644
--- a/docker/test/integration/resources/minifi-c2-server-ssl/config.yml
+++ b/docker/test/integration/resources/minifi-c2-server-ssl/config.yml
@@ -33,11 +33,11 @@ Controller Services:
class: SSLContextService
Properties:
Client Certificate:
- - value: /tmp/minifi-c2-server-ssl/minifi-c2-client.crt
+- value: /tmp/resources/minifi-c2-server-ssl/minifi-cpp-flow.crt
Private Key:
- - value: /tmp/minifi-c2-server-ssl/minifi-c2-client.key
+- value: /tmp/resources/minifi-c2-server-ssl/minifi-cpp-flow.key
Passphrase:
- - value: abcdefgh
+- value: abcdefgh
CA Certificate:
- - value: /tmp/minifi-c2-server-ssl/minifi-c2-server.crt
+- value: /tmp/resources/minifi-c2-server-ssl/root-ca.pem
Remote Process Groups: []
[nifi-minifi-cpp] branch main updated (2dc589158 -> 169cd6822)
This is an automated email from the ASF dual-hosted git repository. adebreceni pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git from 2dc589158 MINIFICPP-1983 Mount files in minifi test containers new 417756064 MINIFICPP-1983 Modify correct minifi.properties file for test containers new 9f2040abc MINIFICPP-2008 Differentiate successful onTriggers from throwing onTriggers in ScheduleAgents new 169cd6822 MINIFICPP-2036 Upgrade gcc to version 11 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: README.md | 2 +- centos.sh | 4 ++-- docker/Dockerfile | 3 ++- docker/centos/Dockerfile | 2 +- .../cluster/containers/MinifiContainer.py | 7 +++--- .../resources/minifi-c2-server-ssl/config.yml | 8 +++ libminifi/include/CronDrivenSchedulingAgent.h | 2 -- libminifi/include/EventDrivenSchedulingAgent.h | 25 +++ libminifi/include/SchedulingAgent.h| 18 +- libminifi/include/ThreadedSchedulingAgent.h| 26 +++- libminifi/include/TimerDrivenSchedulingAgent.h | 27 +++-- libminifi/src/CronDrivenSchedulingAgent.cpp| 17 ++--- libminifi/src/EventDrivenSchedulingAgent.cpp | 16 +++-- libminifi/src/SchedulingAgent.cpp | 28 +- libminifi/src/TimerDrivenSchedulingAgent.cpp | 23 -- 15 files changed, 61 insertions(+), 147 deletions(-)
