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 771ebd3..c9fd29e 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.nifi nifi-nar-bundles - 1.25.0 + 1.26.0 nifi-influx-database-bundle @@ -103,7 +103,7 @@ true - 1.25.0 + 1.26.0 3.2.5 0.8.12 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. org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -252,7 +252,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -291,7 +291,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -398,7 +398,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -448,7 +448,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -490,7 +490,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -529,7 +529,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -568,7 +568,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -607,7 +607,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -708,7 +708,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -809,7 +809,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -848,7 +848,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -1267,7 +1267,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-http-context-map-nar - 1.25.0 + 1.26.0 true @@ -1288,7 +1288,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.25.0 + 1.26.0 true @@ -1373,7 +1373,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-http-context-map-nar - 1.25.0 + 1.26.0 true @@ -1394,7 +1394,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.25.0 + 1.26.0 true @@ -1432,7 +1432,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.25.0 + 1.26.0 true @@ -1532,7 +1532,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.25.0 + 1.26.0 true @@ -1606,7 +1606,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.25.0 + 1.26.0 true @@ -1675,7 +1675,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 5 sec @@ -1754,7 +1754,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -1809,7 +1809,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-kafka-1-0-nar - 1.25.0 + 1.26.0 1 0 sec @@ -1911,7 +1911,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-update-attribute-nar - 1.25.0 + 1.26.0 1 0 sec @@ -2081,7 +2081,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -2350,7 +2350,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.25.0 + 1.26.0 true @@ -2478,7 +2478,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.25.0 + 1.26.0 true @@ -2524,7 +2524,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-registry-nar - 1.25.0 + 1.26.0 true @@ -2571,7 +2571,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -2635,7 +2635,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -2789,7 +2789,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -2918,7 +2918,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -2973,7 +2973,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.25.0 + 1.26.0 1 0 sec @@ -3267,7 +3267,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.25.0 + 1.26.0 false @@ -3341,7 +3341,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.25.0 + 1.26.0 true @@ -3398,7 +3398,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.25.0 + 1.26.0 true @@ -3509,7 +3509,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.25.0 + 1.26.0 true 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}