Skip to content
This repository has been archived by the owner on Aug 13, 2024. It is now read-only.

chore(deps): bump nifi.version from 1.25.0 to 1.26.0 #166

Merged
merged 2 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion scripts/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
72 changes: 36 additions & 36 deletions scripts/flow.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion scripts/nifi-restart.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down