From c0e3c3d2b553c2b9996b4951cc6cf5a2d20a8c1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 May 2024 04:51:53 +0000
Subject: [PATCH 1/2] chore(deps): bump nifi.version from 1.25.0 to 1.26.0

Bumps `nifi.version` from 1.25.0 to 1.26.0.

Updates `org.apache.nifi:nifi-utils` from 1.25.0 to 1.26.0

Updates `org.apache.nifi:nifi-standard-record-utils` from 1.25.0 to 1.26.0

Updates `org.apache.nifi:nifi-mock` from 1.25.0 to 1.26.0

Updates `org.apache.nifi:nifi-mock-record-utils` from 1.25.0 to 1.26.0

Updates `org.apache.nifi:nifi-standard-processors` from 1.25.0 to 1.26.0

Updates `org.apache.nifi:nifi-record-serialization-services` from 1.25.0 to 1.26.0

Updates `org.apache.nifi:nifi-schema-registry-service-api` from 1.25.0 to 1.26.0

Updates `org.apache.nifi:nifi-record-path` from 1.25.0 to 1.26.0

Updates `org.apache.nifi:nifi-standard-utils` from 1.25.0 to 1.26.0

Updates `org.apache.nifi:nifi-ssl-context-service-api` from 1.25.0 to 1.26.0

Updates `org.apache.nifi:nifi-security-utils` from 1.25.0 to 1.26.0

Updates `org.apache.nifi:nifi-standard-services-api-nar` from 1.25.0 to 1.26.0

---
updated-dependencies:
- dependency-name: org.apache.nifi:nifi-utils
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.nifi:nifi-standard-record-utils
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.nifi:nifi-mock
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.nifi:nifi-mock-record-utils
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.nifi:nifi-standard-processors
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.apache.nifi:nifi-record-serialization-services
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.nifi:nifi-schema-registry-service-api
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.apache.nifi:nifi-record-path
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.nifi:nifi-standard-utils
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.nifi:nifi-ssl-context-service-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.nifi:nifi-security-utils
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.nifi:nifi-standard-services-api-nar
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 771ebd3..04cd213 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
 		<!-- skip until remove org.json from Java client -->
         <enforcer.skip>true</enforcer.skip>
 
-        <nifi.version>1.25.0</nifi.version>
+        <nifi.version>1.26.0</nifi.version>
 
         <plugin.surefire.version>3.2.5</plugin.surefire.version>
         <plugin.jacoco.version>0.8.12</plugin.jacoco.version>

From 73be50b98497165c705bbf5d656787a82a5bf03e Mon Sep 17 00:00:00 2001
From: Jakub Bednar <jakub.bednar@gmail.com>
Date: Wed, 15 May 2024 09:31:41 +0200
Subject: [PATCH 2/2] chore: update to Apache NiFi 1.26.0

---
 CHANGELOG.md            |  3 ++
 README.md               |  2 +-
 pom.xml                 |  2 +-
 scripts/Dockerfile      |  2 +-
 scripts/flow.xml        | 72 ++++++++++++++++++++---------------------
 scripts/nifi-restart.sh |  2 +-
 6 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1ac882..472028d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 ### Bug Fixes
 1. [#163](https://github.com/influxdata/nifi-influxdb-bundle/pull/163): Max connection timeout also used as read/write timeout.
 
+### Others
+1. [#156](https://github.com/influxdata/nifi-influxdb-bundle/pull/166): Update to Apache NiFi 1.26.0
+
 ## v1.28.0 [2024-03-01]
 
 ### Others
diff --git a/README.md b/README.md
index 10ffb52..bf317d3 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ The Nar compatibility matrix:
 
 | Nar Version                                                                                                                                                                        | NiFi Version |
 |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------|
-| [nifi-influx-database-nar-1.29.0-SNAPSHOT.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.29.0-SNAPSHOT/nifi-influx-database-nar-1.29.0-SNAPSHOT.nar) | 1.25.0       |
+| [nifi-influx-database-nar-1.29.0-SNAPSHOT.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.29.0-SNAPSHOT/nifi-influx-database-nar-1.29.0-SNAPSHOT.nar) | 1.26.0       |
 | [nifi-influx-database-nar-1.28.0.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.28.0/nifi-influx-database-nar-1.28.0.nar)                            | 1.25.0       |
 | [nifi-influx-database-nar-1.27.0.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.27.0/nifi-influx-database-nar-1.27.0.nar)                            | 1.24.0       |
 | [nifi-influx-database-nar-1.26.0.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.26.0/nifi-influx-database-nar-1.26.0.nar)                            | 1.24.0       |
diff --git a/pom.xml b/pom.xml
index 04cd213..c9fd29e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.25.0</version>
+        <version>1.26.0</version>
     </parent>
 
     <artifactId>nifi-influx-database-bundle</artifactId>
diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index 63d65a6..cdc09a0 100644
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-ARG NIFI_IMAGE=apache/nifi:1.25.0
+ARG NIFI_IMAGE=apache/nifi:1.26.0
 
 FROM $NIFI_IMAGE
 
diff --git a/scripts/flow.xml b/scripts/flow.xml
index 1deced0..dc17b9b 100644
--- a/scripts/flow.xml
+++ b/scripts/flow.xml
@@ -213,7 +213,7 @@ and be able to write data selectively.
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -252,7 +252,7 @@ and be able to write data selectively.
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -291,7 +291,7 @@ and be able to write data selectively.
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -398,7 +398,7 @@ and be able to write data selectively.
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -448,7 +448,7 @@ and be able to write data selectively.
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -490,7 +490,7 @@ and be able to write data selectively.
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -529,7 +529,7 @@ and be able to write data selectively.
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -568,7 +568,7 @@ and be able to write data selectively.
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -607,7 +607,7 @@ and be able to write data selectively.
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -708,7 +708,7 @@ and be able to write data selectively.
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -809,7 +809,7 @@ and be able to write data selectively.
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -848,7 +848,7 @@ and be able to write data selectively.
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -1267,7 +1267,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-http-context-map-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -1288,7 +1288,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -1373,7 +1373,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-http-context-map-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -1394,7 +1394,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -1432,7 +1432,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -1532,7 +1532,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -1606,7 +1606,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -1675,7 +1675,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>5 sec</schedulingPeriod>
@@ -1754,7 +1754,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -1809,7 +1809,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-kafka-1-0-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -1911,7 +1911,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-update-attribute-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -2081,7 +2081,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -2350,7 +2350,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -2478,7 +2478,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -2524,7 +2524,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-registry-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -2571,7 +2571,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -2635,7 +2635,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -2789,7 +2789,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -2918,7 +2918,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -2973,7 +2973,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -3267,7 +3267,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <enabled>false</enabled>
         <property>
@@ -3341,7 +3341,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -3398,7 +3398,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.25.0</version>
+          <version>1.26.0</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -3509,7 +3509,7 @@ curl -i -X GET -G http://localhost:8234 \
       <bundle>
         <group>org.apache.nifi</group>
         <artifact>nifi-record-serialization-services-nar</artifact>
-        <version>1.25.0</version>
+        <version>1.26.0</version>
       </bundle>
       <enabled>true</enabled>
       <property>
diff --git a/scripts/nifi-restart.sh b/scripts/nifi-restart.sh
index 9b2cc57..f93c398 100755
--- a/scripts/nifi-restart.sh
+++ b/scripts/nifi-restart.sh
@@ -23,7 +23,7 @@ DEFAULT_INFLUXDB_VERSION="1.8"
 INFLUXDB_VERSION="${INFLUXDB_VERSION:-$DEFAULT_INFLUXDB_VERSION}"
 INFLUXDB_IMAGE=influxdb:${INFLUXDB_VERSION}
 
-DEFAULT_NIFI_VERSION="1.25.0"
+DEFAULT_NIFI_VERSION="1.26.0"
 NIFI_VERSION="${NIFI_VERSION:-$DEFAULT_NIFI_VERSION}"
 NIFI_IMAGE=apache/nifi:${NIFI_VERSION}