nifi-minifi-cpp git commit: MINIFICPP-649 - Fix some compiler warnings
Repository: nifi-minifi-cpp Updated Branches: refs/heads/master f3febb3da -> 90dfc06aa MINIFICPP-649 - Fix some compiler warnings This closes #423. Signed-off-by: Marc Parisi Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/90dfc06a Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/90dfc06a Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/90dfc06a Branch: refs/heads/master Commit: 90dfc06aaf40a9e3b7e6a947925b280317051836 Parents: f3febb3 Author: Arpad Boda Authored: Thu Oct 18 13:50:27 2018 +0200 Committer: Marc Parisi Committed: Thu Oct 18 21:41:31 2018 -0400 -- LibExample/monitor_directory.c | 1 + extensions/civetweb/processors/ListenHTTP.cpp | 6 +++--- extensions/http-curl/tests/C2VerifyHeartbeatAndStop.cpp | 2 +- libminifi/src/FlowControlProtocol.cpp | 1 - 4 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/90dfc06a/LibExample/monitor_directory.c -- diff --git a/LibExample/monitor_directory.c b/LibExample/monitor_directory.c index 694fd4b..b456fcd 100644 --- a/LibExample/monitor_directory.c +++ b/LibExample/monitor_directory.c @@ -22,6 +22,7 @@ #include #include #include +#include #include "file_blocks.h" #include "comms.h" http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/90dfc06a/extensions/civetweb/processors/ListenHTTP.cpp -- diff --git a/extensions/civetweb/processors/ListenHTTP.cpp b/extensions/civetweb/processors/ListenHTTP.cpp index 46e65e8..210ae1c 100644 --- a/extensions/civetweb/processors/ListenHTTP.cpp +++ b/extensions/civetweb/processors/ListenHTTP.cpp @@ -393,12 +393,12 @@ void ListenHTTP::Handler::write_body(mg_connection *conn, const mg_request_info response.body.size(), req_info->request_uri); mg_printf(conn, "Content-type: "); - mg_printf(conn, response.mime_type.c_str()); + mg_printf(conn, "%s", response.mime_type.c_str()); mg_printf(conn, "\r\n"); mg_printf(conn, "Content-length: "); - mg_printf(conn, std::to_string(response.body.size()).c_str()); + mg_printf(conn, "%s", std::to_string(response.body.size()).c_str()); mg_printf(conn, "\r\n\r\n"); - mg_printf(conn, response.body.c_str()); + mg_printf(conn, "%s", response.body.c_str()); } else { logger_->log_debug("No response body available for URI: %s", req_info->request_uri); http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/90dfc06a/extensions/http-curl/tests/C2VerifyHeartbeatAndStop.cpp -- diff --git a/extensions/http-curl/tests/C2VerifyHeartbeatAndStop.cpp b/extensions/http-curl/tests/C2VerifyHeartbeatAndStop.cpp index f962198..b31fc51 100644 --- a/extensions/http-curl/tests/C2VerifyHeartbeatAndStop.cpp +++ b/extensions/http-curl/tests/C2VerifyHeartbeatAndStop.cpp @@ -78,7 +78,7 @@ class Responder : public CivetHandler { rapidjson::Document root; rapidjson::ParseResult ok = root.Parse(post_data.data(), post_data.size()); bool found = false; - auto operation = root["operation"].GetString(); + std::string operation = root["operation"].GetString(); if (operation == "heartbeat") { assert(root.HasMember("agentInfo") == true); assert(root["agentInfo"]["agentManifest"].HasMember("bundles") == true); http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/90dfc06a/libminifi/src/FlowControlProtocol.cpp -- diff --git a/libminifi/src/FlowControlProtocol.cpp b/libminifi/src/FlowControlProtocol.cpp index 60f701a..396203b 100644 --- a/libminifi/src/FlowControlProtocol.cpp +++ b/libminifi/src/FlowControlProtocol.cpp @@ -33,7 +33,6 @@ namespace nifi { namespace minifi { int FlowControlProtocol::connectServer(const char *host, uint16_t port) { - in_addr addr; return 0; }
svn commit: r1844263 - /nifi/site/trunk/registry.html
Author: aldrin Date: Thu Oct 18 16:40:13 2018 New Revision: 1844263 URL: http://svn.apache.org/viewvc?rev=1844263=rev Log: NIFIREG-195 Adding GitFlowPersistenceProvider video to Registry home page Modified: nifi/site/trunk/registry.html Modified: nifi/site/trunk/registry.html URL: http://svn.apache.org/viewvc/nifi/site/trunk/registry.html?rev=1844263=1844262=1844263=diff == --- nifi/site/trunk/registry.html (original) +++ nifi/site/trunk/registry.html Thu Oct 18 16:40:13 2018 @@ -164,32 +164,35 @@ -0.3.0 +0.2.0 Sources -https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-registry/nifi-registry-0.3.0/nifi-registry-0.3.0-source-release.zip;>nifi-registry-0.3.0-source-release.zip ( - https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.3.0/nifi-registry-0.3.0-source-release.zip.asc;>asc, - https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.3.0/nifi-registry-0.3.0-source-release.zip.sha256;>sha256, - https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.3.0/nifi-registry-0.3.0-source-release.zip.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-registry/nifi-registry-0.2.0/nifi-registry-0.2.0-source-release.zip;>nifi-registry-0.2.0-source-release.zip ( + https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.2.0/nifi-registry-0.2.0-source-release.zip.asc;>asc, + https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.2.0/nifi-registry-0.2.0-source-release.zip.sha1;>sha1, + https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.2.0/nifi-registry-0.2.0-source-release.zip.sha256;>sha256, + https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.2.0/nifi-registry-0.2.0-source-release.zip.sha512;>sha512 ) Binaries -https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-registry/nifi-registry-0.3.0/nifi-registry-0.3.0-bin.tar.gz;>nifi-registry-0.3.0-bin.tar.gz ( - https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.3.0/nifi-registry-0.3.0-bin.tar.gz.asc;>asc, - https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.3.0/nifi-registry-0.3.0-bin.tar.gz.sha256;>sha256, - https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.3.0/nifi-registry-0.3.0-bin.tar.gz.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-registry/nifi-registry-0.2.0/nifi-registry-0.2.0-bin.tar.gz;>nifi-registry-0.2.0-bin.tar.gz ( + https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.2.0/nifi-registry-0.2.0-bin.tar.gz.asc;>asc, + https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.2.0/nifi-registry-0.2.0-bin.tar.gz.sha1;>sha1, + https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.2.0/nifi-registry-0.2.0-bin.tar.gz.sha256;>sha256, + https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.2.0/nifi-registry-0.2.0-bin.tar.gz.sha512;>sha256 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-registry/nifi-registry-0.3.0/nifi-registry-0.3.0-bin.zip;>nifi-registry-0.3.0-bin.zip ( - https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.3.0/nifi-registry-0.3.0-bin.zip.asc;>asc, - https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.3.0/nifi-registry-0.3.0-bin.zip.sha256;>sha256, - https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.3.0/nifi-registry-0.3.0-bin.zip.sha513;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-registry/nifi-registry-0.2.0/nifi-registry-0.2.0-bin.zip;>nifi-registry-0.2.0-bin.zip ( + https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.2.0/nifi-registry-0.2.0-bin.zip.asc;>asc, + https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.2.0/nifi-registry-0.2.0-bin.zip.sha1;>sha1, + https://www.apache.org/dist/nifi/nifi-registry/nifi-registry-0.2.0/nifi-registry-0.2.0-bin.zip.sha256;>sha256, +
nifi-site git commit: NIFIREG-195 Add GitFlowPersistenceProvider video to Registry home page
Repository: nifi-site Updated Branches: refs/heads/master 04f11decd -> 28cc17792 NIFIREG-195 Add GitFlowPersistenceProvider video to Registry home page This closes #29. Signed-off-by: Aldrin Piri Project: http://git-wip-us.apache.org/repos/asf/nifi-site/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-site/commit/28cc1779 Tree: http://git-wip-us.apache.org/repos/asf/nifi-site/tree/28cc1779 Diff: http://git-wip-us.apache.org/repos/asf/nifi-site/diff/28cc1779 Branch: refs/heads/master Commit: 28cc177929a0d9fddb06cba5cb470622ff8c8b67 Parents: 04f11de Author: Andrew Lim Authored: Wed Aug 15 14:50:14 2018 -0400 Committer: Aldrin Piri Committed: Thu Oct 18 12:38:24 2018 -0400 -- src/pages/html/registry.hbs | 10 ++ 1 file changed, 10 insertions(+) -- http://git-wip-us.apache.org/repos/asf/nifi-site/blob/28cc1779/src/pages/html/registry.hbs -- diff --git a/src/pages/html/registry.hbs b/src/pages/html/registry.hbs index 5ae..f94419e 100644 --- a/src/pages/html/registry.hbs +++ b/src/pages/html/registry.hbs @@ -135,6 +135,16 @@ title: Apache NiFi - Registry + + Storing Versioned Flows in a Git Repository + +Storing Versioned Flows in a Git Repository + +https://www.youtube.com/embed/kK7eVppg9Aw; frameborder="0" allow="autoplay; encrypted-media" allowfullscreen> + + + +
nifi-minifi-cpp git commit: MINIFICPP-643: Make updates to correct build, allow openssl, and enforce a force build command for windows
Repository: nifi-minifi-cpp Updated Branches: refs/heads/master a82ac26a1 -> f3febb3da MINIFICPP-643: Make updates to correct build, allow openssl, and enforce a force build command for windows This closes #419. Signed-off-by: Aldrin Piri Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/f3febb3d Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/f3febb3d Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/f3febb3d Branch: refs/heads/master Commit: f3febb3da8f8805a0d486284ade05b93dfd6f714 Parents: a82ac26 Author: Marc Parisi Authored: Wed Oct 17 14:24:18 2018 -0400 Committer: Aldrin Piri Committed: Thu Oct 18 10:45:07 2018 -0400 -- CMakeLists.txt | 21 +++- CMakeSettings.json | 124 +++ README.md | 2 + appveyor.yml| 2 +- controller/CMakeLists.txt | 4 +- extensions/librdkafka/CMakeLists.txt| 2 - extensions/rocksdb-repos/CMakeLists.txt | 2 - extensions/windows-event-log/CMakeLists.txt | 2 - libminifi/CMakeLists.txt| 2 +- .../include/controllers/SSLContextService.h | 2 + libminifi/include/core/Core.h | 4 +- libminifi/include/core/Resource.h | 2 + libminifi/src/c2/C2Agent.cpp| 4 +- .../Simple-Windows-Posix-Semaphore/semaphore.h | 4 +- 14 files changed, 106 insertions(+), 71 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/f3febb3d/CMakeLists.txt -- diff --git a/CMakeLists.txt b/CMakeLists.txt index bb07922..4b0f7a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,10 +37,15 @@ endif() option(ENABLE_PYTHON "Instructs the build system to enable building shared objects for the python lib" OFF) option(USE_SYSTEM_BZIP2 "Instructs the build system to search for and use a bzip2 library available in the host system" ON) option(BUILD_ROCKSDB "Instructs the build system to use RocksDB from the third party directory" ON) +option(FORCE_WINDOWS "Instructs the build system to force Windows builds when WIN32 is specified" OFF) include(FeatureSummary) include(ExternalProject) +if (OPENSSL_ROOT_DIR ) + set(OPENSSL_PASSTHROUGH "-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}") +endif() + set(PASSTHROUGH_CMAKE_ARGS -DANDROID_ABI=${ANDROID_ABI} -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_STL=${ANDROID_STL} @@ -57,6 +62,7 @@ set(PASSTHROUGH_CMAKE_ARGS -DANDROID_ABI=${ANDROID_ABI} -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=${CMAKE_FIND_ROOT_PATH_MODE_LIBRARY} -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} + ${OPENSSL_PASSTHROUGH} -G${CMAKE_GENERATOR}) # Use ccache if present @@ -71,6 +77,9 @@ endif(CCACHE_FOUND) # Enable usage of the VERSION specifier include(CheckCXXCompilerFlag) if (WIN32) + if (NOT FORCE_WINDOWS) + message(FATAL_ERROR "Windows builds can only be built with FORCE_WINDOWS") + endif() add_definitions(-DWIN32_LEAN_AND_MEAN) if ((MSVC_VERSION GREATER "1900") OR (MSVC_VERSION EQUAL "1900")) CHECK_CXX_COMPILER_FLAG("/std:c++14" _cpp_latest_flag_supported) @@ -160,6 +169,8 @@ else() # Include OpenSSL find_package (OpenSSL REQUIRED) + + if (OPENSSL_FOUND) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOPENSSL_SUPPORT") @@ -273,15 +284,17 @@ if(NOT DISABLE_CURL AND (NOT USE_SYSTEM_CURL)) BUILD_BYPRODUCTS "thirdparty/${BYPRODUCT}" ) - if(NOT USE_SYSTEM_OPENSSL) + if(USE_SYSTEM_OPENSSL STREQUAL "OFF") add_dependencies(curl-external libressl-portable) endif() list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/curl/dummy") add_library(curl STATIC IMPORTED) set_target_properties(curl PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${BYPRODUCT}") - if (OPENSSL_FOUND) - set_target_properties(curl PROPERTIES INTERFACE_LINK_LIBRARIES ${OPENSSL_LIBRARIES}) + if (OPENSSL_FOUND) + if (NOT WIN32) + set_target_properties(curl PROPERTIES INTERFACE_LINK_LIBRARIES ${OPENSSL_LIBRARIES}) +endif() endif(OPENSSL_FOUND) add_dependencies(curl curl-external) set(CURL_FOUND "YES") @@ -303,7 +316,7 @@ set(CIVETWEB_ENABLE_CXX ON CACHE BOOL "Enable civet C++ library")
[nifi] Git Push Summary
Repository: nifi Updated Tags: refs/tags/nifi-1.8.0-RC1 [created] 2fdc819e6
[nifi] Git Push Summary
Repository: nifi Updated Tags: refs/tags/nifi-1.8.0-RC1 [deleted] bb4935cda
[nifi] Git Push Summary
Repository: nifi Updated Tags: refs/tags/nifi-1.8.0-RC1 [created] bb4935cda
[nifi] Git Push Summary
Repository: nifi Updated Tags: refs/tags/nifi-5720-RC1 [deleted] bb4935cda
[nifi] Git Push Summary
Repository: nifi Updated Tags: refs/tags/nifi-5720-RC1 [created] bb4935cda
nifi git commit: NIFI-5446: Specify the file encoding option to UTF-8 in pom.xml
Repository: nifi Updated Branches: refs/heads/master f3f7cdbab -> ec8afd18d NIFI-5446: Specify the file encoding option to UTF-8 in pom.xml This closes #2910. Signed-off-by: Koji Kawamura Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ec8afd18 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ec8afd18 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ec8afd18 Branch: refs/heads/master Commit: ec8afd18d6ae39dc1b09698fabfd1d3e7eaa70cf Parents: f3f7cdb Author: Takanobu Asanuma Authored: Mon Jul 23 13:53:51 2018 +0900 Committer: Koji Kawamura Committed: Thu Oct 18 15:09:23 2018 +0900 -- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/ec8afd18/pom.xml -- diff --git a/pom.xml b/pom.xml index b86cada..37c3c01 100644 --- a/pom.xml +++ b/pom.xml @@ -348,7 +348,8 @@ true -Xmx1G -Djava.net.preferIPv4Stack=true -${maven.surefire.arguments} +${maven.surefire.arguments} +-Dfile.encoding=UTF-8