nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ab...@apache.org
Subject [nifi-minifi-cpp] branch main updated: MINIFICPP-1581: set cmake policy CMP0096 to NEW to preserve the leading zeros in project version
Date Mon, 07 Jun 2021 14:43:21 GMT
This is an automated email from the ASF dual-hosted git repository.

aboda pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git


The following commit(s) were added to refs/heads/main by this push:
     new 6020496  MINIFICPP-1581: set cmake policy CMP0096 to NEW to preserve the leading
zeros in project version
6020496 is described below

commit 6020496ad1cd2fc236815ee78b3d9f2cee640a0c
Author: Martin Zink <martin.zink@protonmail.com>
AuthorDate: Fri Jun 4 10:24:47 2021 +0200

    MINIFICPP-1581: set cmake policy CMP0096 to NEW to preserve the leading zeros in project
version
    
    MINIFICPP-1581: set cmake policy for nanofi and libminifi
    
    use the buster-backports repo to install cmake 3.16.3 in debian ci job
    
    updated README.md and all cmake requirements to 3.16
    
    use java 11 on debian buster
    
    Signed-off-by: Arpad Boda <aboda@apache.org>
    
    This closes #1098
---
 CMakeLists.txt                 | 3 ++-
 README.md                      | 2 +-
 controller/CMakeLists.txt      | 2 +-
 debian.sh                      | 4 ++--
 docker/debian/Dockerfile       | 6 ++++--
 extensions/ExtensionHeader.txt | 2 +-
 libminifi/CMakeLists.txt       | 4 ++--
 main/CMakeLists.txt            | 2 +-
 nanofi/CMakeLists.txt          | 3 ++-
 nanofi/ecu/CMakeLists.txt      | 2 +-
 nanofi/examples/CMakeLists.txt | 2 +-
 11 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f4d496..1ac5db7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,8 @@
 # under the License.
 #
 
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.16)
+cmake_policy(SET CMP0096 NEW) # policy to preserve the leading zeros in PROJECT_VERSION_{MAJOR,MINOR,PATCH,TWEAK}
 cmake_policy(SET CMP0065 OLD) # default export policy, required for self-dlopen
 project(nifi-minifi-cpp VERSION 0.10.0)
 set(PROJECT_NAME "nifi-minifi-cpp")
diff --git a/README.md b/README.md
index 4e8a5f6..ecf16c4 100644
--- a/README.md
+++ b/README.md
@@ -111,7 +111,7 @@ Through JNI extensions you can run NiFi processors using NARs. The JNI
extension
 ### To build
 
 #### Utilities
-* CMake 3.11 or greater
+* CMake 3.16 or greater
 * gcc 4.8.4 or greater
 * g++ 4.8.4 or greater
 * bison 3.0.x (3.2 has been shown to fail builds)
diff --git a/controller/CMakeLists.txt b/controller/CMakeLists.txt
index 6610973..5533ba7 100644
--- a/controller/CMakeLists.txt
+++ b/controller/CMakeLists.txt
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.16)
 
 include_directories(../main/ ../libminifi/include  ../libminifi/include/c2  ../libminifi/include/c2/protocols/
 ../libminifi/include/core/state ./libminifi/include/core/statemanagement/metrics  ../libminifi/include/core/yaml
 ../libminifi/include/core)
 
diff --git a/debian.sh b/debian.sh
index 0df18e7..52836e9 100644
--- a/debian.sh
+++ b/debian.sh
@@ -67,8 +67,8 @@ build_deps(){
           elif [ "$FOUND_VALUE" = "lua" ]; then
             INSTALLED+=("liblua5.1-0-dev")
           elif [ "$FOUND_VALUE" = "jnibuild" ]; then
-            INSTALLED+=("openjdk-8-jdk")
-            INSTALLED+=("openjdk-8-source")
+            INSTALLED+=("openjdk-11-jdk")
+            INSTALLED+=("openjdk-11-source")
             INSTALLED+=("maven")
           elif [ "$FOUND_VALUE" = "automake" ]; then
             INSTALLED+=("automake")
diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
index 1691606..e353b8b 100644
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@@ -26,9 +26,11 @@ ARG MINIFI_VERSION
 
 ENV MINIFI_BASE_DIR /opt/minifi
 ENV MINIFI_HOME $MINIFI_BASE_DIR/nifi-minifi-cpp-$MINIFI_VERSION
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64/
 
-RUN apt-get update && apt-get install -y openjdk-11-jdk openjdk-11-source libpython3.7-dev
sudo git maven libarchive13 cmake
+RUN echo "deb http://deb.debian.org/debian buster-backports main" | tee -a /etc/apt/sources.list
\
+    && apt-get update && apt-get install -y openjdk-11-jdk openjdk-11-source
libpython3.7-dev sudo git maven libarchive13 libtool \
+    && apt-get -t buster-backports install -y cmake
 
 RUN mkdir -p $MINIFI_BASE_DIR
 COPY . ${MINIFI_BASE_DIR}
diff --git a/extensions/ExtensionHeader.txt b/extensions/ExtensionHeader.txt
index d7ac551..db240d1 100644
--- a/extensions/ExtensionHeader.txt
+++ b/extensions/ExtensionHeader.txt
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.16)
 
 
 include_directories(../../libminifi/include ../../libminifi/include/core)
diff --git a/libminifi/CMakeLists.txt b/libminifi/CMakeLists.txt
index 26bd3b3..7a4b751 100644
--- a/libminifi/CMakeLists.txt
+++ b/libminifi/CMakeLists.txt
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-cmake_minimum_required (VERSION 3.11)
-
+cmake_minimum_required (VERSION 3.16)
+cmake_policy(SET CMP0096 NEW) # policy to preserve the leading zeros in PROJECT_VERSION_{MAJOR,MINOR,PATCH,TWEAK}
 project(nifi-libcore-minifi VERSION 0.10.0)
 set(PROJECT_NAME "nifi-libcore-minifi")
 
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 8dd958b..a0106d5 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.16)
 
 include_directories(../libminifi/include)
 
diff --git a/nanofi/CMakeLists.txt b/nanofi/CMakeLists.txt
index d4391e9..09cc366 100644
--- a/nanofi/CMakeLists.txt
+++ b/nanofi/CMakeLists.txt
@@ -17,7 +17,8 @@
 # under the License.
 #
 
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.16)
+cmake_policy(SET CMP0096 NEW) # policy to preserve the leading zeros in PROJECT_VERSION_{MAJOR,MINOR,PATCH,TWEAK}
 
 include_directories(include)
 include_directories(../libminifi/include)
diff --git a/nanofi/ecu/CMakeLists.txt b/nanofi/ecu/CMakeLists.txt
index 5985666..35e99bc 100644
--- a/nanofi/ecu/CMakeLists.txt
+++ b/nanofi/ecu/CMakeLists.txt
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.16)
 
 
 if (NOT WIN32)
diff --git a/nanofi/examples/CMakeLists.txt b/nanofi/examples/CMakeLists.txt
index bc33da7..5619566 100644
--- a/nanofi/examples/CMakeLists.txt
+++ b/nanofi/examples/CMakeLists.txt
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.16)
 
 include_directories(/include)
 

Mime
View raw message