Merge branch 'development' into 'master'

Merge Development branch to Master branch

See merge request !41

Dockerfile

@@ -2,11 +2,11 @@ ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk11
 ARG BASE_TAG=1.11
 
-FROM apache/nifi:1.13.2 as base
+FROM apache/nifi:1.14.0 as base
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-ENV NIFI_VERSION=1.13.0
+ENV NIFI_VERSION=1.14.0
 ENV NIFI_BASE_DIR=/opt/nifi
 ENV NIFI_HOME=${NIFI_BASE_DIR}/nifi-current
 ENV NIFI_VERSION_DIR=nifi-${NIFI_VERSION} \

hardening_manifest.yaml

@@ -8,7 +8,7 @@ name: "opensource/apache/nifi"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-- "1.13.2"
+- "1.14.0"
 - "latest"
 
 # Build args passed to Dockerfile ARGs
@@ -27,7 +27,7 @@ labels:
   org.opencontainers.image.url: "https://nifi.apache.org"
   ## Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "Apache"
-  org.opencontainers.image.version: "1.13.2"
+  org.opencontainers.image.version: "1.14.0"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "dataflow,processing"
   ## This value can be "opensource" or "commercial"
@@ -37,8 +37,8 @@ labels:
 
 # List of resources to make available to the offline build context
 resources:
-- tag: apache/nifi:1.13.2
-  url: docker://docker.io/apache/nifi@sha256:2f4dbbe29ec83d8f43ef36ab07c1e4a139e5c2f75bab538c2bf7ee53d1b93bd7
+- tag: apache/nifi:1.14.0
+  url: docker://docker.io/apache/nifi@sha256:1ac74e65b7ff93f3473e57bd4f8fe63390d32125115e224f8599306cc7aee3be
 - filename: xmlstarlet.rpm
   url: https://download-ib01.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/x/xmlstarlet-1.6.1-11.el8.x86_64.rpm
   validation: