This is an automated email from the ASF dual-hosted git repository.
lordgamez pushed a change to branch MINIFICPP-2849
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
omit aa0f26168 Replace ENABLE_LMDB option with MINIFI_LMDB
omit 3653c3b22 Update LMDB and add conan recipe
omit f0f3414be Review update
omit e0c2d8ee6 Review update
omit 3195845b2 Fix LMDB build on Windows with WIN32_LEAN_AND_MEAN defined
omit 46cce2068 Fix lmdb lifetime issues
omit 524611258 MINIFICPP-2849 Implement LMDB based content repository
add d89fea9eb MINIFICPP-2881 Set MINIFI_API_VERSION to 2 (#2244)
add 894ba4d1e MINIFICPP-2861 Add Conan support for docker and clang CI
builds (#2216)
add a6d147bbb MINIFICPP-2877 Clean up memcheck (#2243)
add dfba4edfb MINIFICPP-2866 Add Conan support for SOCI and iODBC
libraries (#2218)
add 146d0dd5e MINIFICPP-2849 Implement LMDB based content repository
add b522d624d Fix lmdb lifetime issues
add 1f91ff276 Fix LMDB build on Windows with WIN32_LEAN_AND_MEAN defined
add fc19c41c4 Review update
add 24e4d93b8 Review update
add e5e0e9547 Update LMDB and add conan recipe
add 6d432ab7a Replace ENABLE_LMDB option with MINIFI_LMDB
add b045aa6b2 Disable LMDB extension by default and mark is as experimental
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (aa0f26168)
\
N -- N -- N refs/heads/MINIFICPP-2849 (b045aa6b2)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.dockerignore | 1 +
.github/workflows/ci.yml | 16 +-
.github/workflows/memcheck_ci.yml | 19 +++
CMakeLists.txt | 1 +
CONFIGURE.md | 4 +-
bootstrap/cli.py | 26 ++-
bootstrap/main.py | 7 +-
bootstrap/minifi_option.py | 2 +-
bootstrap/package_manager.py | 21 +++
cmake/BundledIodbc.cmake | 56 +++++++
cmake/DockerConfig.cmake | 30 ++--
cmake/{GetAsio.cmake => GetIODBC.cmake} | 12 +-
cmake/{GetSpdlog.cmake => GetSOCI.cmake} | 24 ++-
cmake/MiNiFiOptions.cmake | 13 +-
cmake/PahoMqttC.cmake | 2 +-
cmake/Soci.cmake | 47 ++++++
cmake/valgrind.supp | 121 ++++++++++++++
conanfile.py | 22 ++-
docker/DockerBuild.sh | 18 ++-
docker/Dockerfile | 28 +++-
docker/rockylinux/Dockerfile | 25 ++-
.../config.yml => docker/settings_user.yml | 6 +-
extensions/opc/include/opc.h | 2 +-
extensions/opc/src/opc.cpp | 39 +++--
extensions/opc/tests/PutOpcProcessorTests.cpp | 5 +
extensions/sql/CMakeLists.txt | 152 +----------------
minifi-api/include/minifi-api.h | 2 +-
.../{google-cloud-cpp => iodbc}/all/conandata.yml | 12 +-
thirdparty/{ossp-uuid => iodbc}/all/conanfile.py | 61 +++----
.../GCC-15-needs-typedef-SQLRETURN-HPROC.patch | 0
thirdparty/{magic-enum => iodbc}/config.yml | 2 +-
thirdparty/paho-mqtt/all/conandata.yml | 7 +
thirdparty/paho-mqtt/all/conanfile.py | 171 ++++++++++++++++++++
.../{ => all/patches}/cmake-openssl.patch | 0
thirdparty/{grpc => paho-mqtt}/config.yml | 2 +-
.../{google-cloud-cpp => soci}/all/conandata.yml | 15 +-
thirdparty/soci/all/conanfile.py | 180 +++++++++++++++++++++
.../all/patches/disable-sqlwchar-support.patch | 31 ++++
.../odbc-get-parameter-name-bounds-safe.patch | 17 ++
thirdparty/{magic-enum => soci}/config.yml | 2 +-
thirdparty/soci/sqlite3-path.patch | 36 -----
41 files changed, 927 insertions(+), 310 deletions(-)
create mode 100644 cmake/BundledIodbc.cmake
copy cmake/{GetAsio.cmake => GetIODBC.cmake} (76%)
copy cmake/{GetSpdlog.cmake => GetSOCI.cmake} (66%)
create mode 100644 cmake/Soci.cmake
create mode 100644 cmake/valgrind.supp
copy thirdparty/couchbase/config.yml => docker/settings_user.yml (94%)
copy thirdparty/{google-cloud-cpp => iodbc}/all/conandata.yml (72%)
copy thirdparty/{ossp-uuid => iodbc}/all/conanfile.py (56%)
rename thirdparty/{iODBC =>
iodbc/all/patches}/GCC-15-needs-typedef-SQLRETURN-HPROC.patch (100%)
copy thirdparty/{magic-enum => iodbc}/config.yml (98%)
create mode 100644 thirdparty/paho-mqtt/all/conandata.yml
create mode 100644 thirdparty/paho-mqtt/all/conanfile.py
rename thirdparty/paho-mqtt/{ => all/patches}/cmake-openssl.patch (100%)
copy thirdparty/{grpc => paho-mqtt}/config.yml (98%)
copy thirdparty/{google-cloud-cpp => soci}/all/conandata.yml (60%)
create mode 100644 thirdparty/soci/all/conanfile.py
create mode 100644 thirdparty/soci/all/patches/disable-sqlwchar-support.patch
create mode 100644
thirdparty/soci/all/patches/odbc-get-parameter-name-bounds-safe.patch
copy thirdparty/{magic-enum => soci}/config.yml (98%)
delete mode 100644 thirdparty/soci/sqlite3-path.patch
