This is an automated email from the ASF dual-hosted git repository. lordgamez pushed a commit to branch MINIFICPP-2629 in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 054fd16f89cc8b70ebec6ef883da4edf99372cb6 Author: Gabor Gyimesi <[email protected]> AuthorDate: Tue Sep 23 15:01:40 2025 +0200 Fix after rebase --- extensions/standard-processors/controllers/XMLReader.cpp | 2 +- extensions/standard-processors/controllers/XMLReader.h | 2 +- extensions/standard-processors/controllers/XMLRecordSetWriter.cpp | 2 +- extensions/standard-processors/controllers/XMLRecordSetWriter.h | 2 +- extensions/standard-processors/processors/ConvertRecord.h | 2 +- extensions/standard-processors/processors/EvaluateJsonPath.h | 4 +--- extensions/standard-processors/processors/SplitJson.h | 4 +--- 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/extensions/standard-processors/controllers/XMLReader.cpp b/extensions/standard-processors/controllers/XMLReader.cpp index 56749b258..88cebe7ba 100644 --- a/extensions/standard-processors/controllers/XMLReader.cpp +++ b/extensions/standard-processors/controllers/XMLReader.cpp @@ -22,7 +22,7 @@ #include "core/Resource.h" #include "utils/TimeUtil.h" -#include "utils/gsl.h" +#include "minifi-cpp/utils/gsl.h" namespace org::apache::nifi::minifi::standard { diff --git a/extensions/standard-processors/controllers/XMLReader.h b/extensions/standard-processors/controllers/XMLReader.h index 44b045cf1..383be487d 100644 --- a/extensions/standard-processors/controllers/XMLReader.h +++ b/extensions/standard-processors/controllers/XMLReader.h @@ -18,7 +18,7 @@ #include "controllers/RecordSetReader.h" #include "core/PropertyDefinitionBuilder.h" -#include "core/logging/Logger.h" +#include "minifi-cpp/core/logging/Logger.h" #include "core/logging/LoggerFactory.h" #include "pugixml.hpp" diff --git a/extensions/standard-processors/controllers/XMLRecordSetWriter.cpp b/extensions/standard-processors/controllers/XMLRecordSetWriter.cpp index 8241f5ab3..b98cbb67b 100644 --- a/extensions/standard-processors/controllers/XMLRecordSetWriter.cpp +++ b/extensions/standard-processors/controllers/XMLRecordSetWriter.cpp @@ -17,7 +17,7 @@ #include "XMLRecordSetWriter.h" #include "core/Resource.h" -#include "Exception.h" +#include "minifi-cpp/Exception.h" #include "utils/TimeUtil.h" #include "utils/ParsingUtils.h" #include "utils/GeneralUtils.h" diff --git a/extensions/standard-processors/controllers/XMLRecordSetWriter.h b/extensions/standard-processors/controllers/XMLRecordSetWriter.h index e9d27b995..6b1456113 100644 --- a/extensions/standard-processors/controllers/XMLRecordSetWriter.h +++ b/extensions/standard-processors/controllers/XMLRecordSetWriter.h @@ -18,7 +18,7 @@ #include "controllers/RecordSetWriter.h" #include "core/PropertyDefinitionBuilder.h" -#include "core/logging/Logger.h" +#include "minifi-cpp/core/logging/Logger.h" #include "core/logging/LoggerFactory.h" #include "pugixml.hpp" diff --git a/extensions/standard-processors/processors/ConvertRecord.h b/extensions/standard-processors/processors/ConvertRecord.h index 7247c3ed3..daf1ffe27 100644 --- a/extensions/standard-processors/processors/ConvertRecord.h +++ b/extensions/standard-processors/processors/ConvertRecord.h @@ -23,7 +23,7 @@ #include "core/AbstractProcessor.h" #include "core/ProcessSession.h" #include "core/PropertyDefinitionBuilder.h" -#include "core/RelationshipDefinition.h" +#include "minifi-cpp/core/RelationshipDefinition.h" #include "controllers/RecordSetReader.h" #include "controllers/RecordSetWriter.h" diff --git a/extensions/standard-processors/processors/EvaluateJsonPath.h b/extensions/standard-processors/processors/EvaluateJsonPath.h index ddf312cc3..681a4b3b6 100644 --- a/extensions/standard-processors/processors/EvaluateJsonPath.h +++ b/extensions/standard-processors/processors/EvaluateJsonPath.h @@ -20,12 +20,10 @@ #include <string_view> #include <array> -#include "core/logging/LoggerFactory.h" #include "core/ProcessorImpl.h" -#include "core/PropertyDefinition.h" #include "core/PropertyDefinitionBuilder.h" #include "minifi-cpp/core/PropertyValidator.h" -#include "core/RelationshipDefinition.h" +#include "minifi-cpp/core/RelationshipDefinition.h" #include "jsoncons/json.hpp" diff --git a/extensions/standard-processors/processors/SplitJson.h b/extensions/standard-processors/processors/SplitJson.h index ff386c187..289ef16a6 100644 --- a/extensions/standard-processors/processors/SplitJson.h +++ b/extensions/standard-processors/processors/SplitJson.h @@ -21,12 +21,10 @@ #include <array> #include <optional> -#include "core/logging/LoggerFactory.h" #include "core/ProcessorImpl.h" -#include "core/PropertyDefinition.h" #include "core/PropertyDefinitionBuilder.h" #include "minifi-cpp/core/PropertyValidator.h" -#include "core/RelationshipDefinition.h" +#include "minifi-cpp/core/RelationshipDefinition.h" #include "jsoncons/json.hpp"
