From 47c0feccc9caa148767a9bb01eb3af82184be865 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 05:01:13 +0000 Subject: [PATCH 1/3] chore(deps): bump nifi.version from 1.23.2 to 1.24.0 Bumps `nifi.version` from 1.23.2 to 1.24.0. Updates `org.apache.nifi:nifi-utils` from 1.23.2 to 1.24.0 Updates `org.apache.nifi:nifi-standard-record-utils` from 1.23.2 to 1.24.0 Updates `org.apache.nifi:nifi-mock` from 1.23.2 to 1.24.0 Updates `org.apache.nifi:nifi-mock-record-utils` from 1.23.2 to 1.24.0 Updates `org.apache.nifi:nifi-standard-processors` from 1.23.2 to 1.24.0 Updates `org.apache.nifi:nifi-record-serialization-services` from 1.23.2 to 1.24.0 Updates `org.apache.nifi:nifi-schema-registry-service-api` from 1.23.2 to 1.24.0 Updates `org.apache.nifi:nifi-record-path` from 1.23.2 to 1.24.0 Updates `org.apache.nifi:nifi-standard-utils` from 1.23.2 to 1.24.0 Updates `org.apache.nifi:nifi-ssl-context-service-api` from 1.23.2 to 1.24.0 Updates `org.apache.nifi:nifi-security-utils` from 1.23.2 to 1.24.0 Updates `org.apache.nifi:nifi-standard-services-api-nar` from 1.23.2 to 1.24.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] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68adff5..40f7bb6 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,7 @@ true - 1.23.2 + 1.24.0 2.22.2 0.8.8 From 58fc7a993c03e37177f90596c51120a6d57469cf Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Mon, 4 Dec 2023 11:51:02 +0100 Subject: [PATCH 2/3] chore: update to Apache NiFi 1.24.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 76cfc0d..a4fc772 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## v1.26.0 [unreleased] +### Others +1. [#135](https://github.com/influxdata/nifi-influxdb-bundle/pull/135): Update to Apache NiFi 1.24.0 + ## v1.25.0 [2023-10-02] ### Others diff --git a/README.md b/README.md index 3b87c03..c074dbf 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ The Nar compatibility matrix: | Nar Version | NiFi Version | |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------| -| [nifi-influx-database-nar-1.26.0-SNAPSHOT.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.26.0-SNAPSHOT/nifi-influx-database-nar-1.26.0-SNAPSHOT.nar) | 1.23.2 | +| [nifi-influx-database-nar-1.26.0-SNAPSHOT.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.26.0-SNAPSHOT/nifi-influx-database-nar-1.26.0-SNAPSHOT.nar) | 1.24.0 | | [nifi-influx-database-nar-1.25.0.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.25.0/nifi-influx-database-nar-1.25.0.nar) | 1.23.2 | | [nifi-influx-database-nar-1.24.0.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.24.0/nifi-influx-database-nar-1.24.0.nar) | 1.19.0 | | [nifi-influx-database-nar-1.23.0.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.23.0/nifi-influx-database-nar-1.23.0.nar) | 1.18.0 | diff --git a/pom.xml b/pom.xml index 40f7bb6..292a715 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.nifi nifi-nar-bundles - 1.23.2 + 1.24.0 nifi-influx-database-bundle diff --git a/scripts/Dockerfile b/scripts/Dockerfile index e17e52b..7c03e03 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -ARG NIFI_IMAGE=apache/nifi:1.23.2 +ARG NIFI_IMAGE=apache/nifi:1.24.0 FROM $NIFI_IMAGE diff --git a/scripts/flow.xml b/scripts/flow.xml index 1a32834..fe40379 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.23.2 + 1.24.0 1 0 sec @@ -252,7 +252,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.0 1 0 sec @@ -291,7 +291,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.0 1 0 sec @@ -398,7 +398,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.0 1 0 sec @@ -448,7 +448,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.0 1 0 sec @@ -490,7 +490,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.0 1 0 sec @@ -529,7 +529,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.0 1 0 sec @@ -568,7 +568,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.0 1 0 sec @@ -607,7 +607,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.0 1 0 sec @@ -708,7 +708,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.0 1 0 sec @@ -809,7 +809,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.0 1 0 sec @@ -848,7 +848,7 @@ and be able to write data selectively. org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.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.23.2 + 1.24.0 true @@ -1288,7 +1288,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.23.2 + 1.24.0 true @@ -1373,7 +1373,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-http-context-map-nar - 1.23.2 + 1.24.0 true @@ -1394,7 +1394,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.23.2 + 1.24.0 true @@ -1432,7 +1432,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.23.2 + 1.24.0 true @@ -1532,7 +1532,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.23.2 + 1.24.0 true @@ -1606,7 +1606,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.23.2 + 1.24.0 true @@ -1675,7 +1675,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.0 1 5 sec @@ -1754,7 +1754,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.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.23.2 + 1.24.0 1 0 sec @@ -1911,7 +1911,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-update-attribute-nar - 1.23.2 + 1.24.0 1 0 sec @@ -2081,7 +2081,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.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.23.2 + 1.24.0 true @@ -2478,7 +2478,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.23.2 + 1.24.0 true @@ -2524,7 +2524,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-registry-nar - 1.23.2 + 1.24.0 true @@ -2571,7 +2571,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.0 1 0 sec @@ -2635,7 +2635,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.0 1 0 sec @@ -2789,7 +2789,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.0 1 0 sec @@ -2918,7 +2918,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.0 1 0 sec @@ -2973,7 +2973,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-standard-nar - 1.23.2 + 1.24.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.23.2 + 1.24.0 false @@ -3341,7 +3341,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.23.2 + 1.24.0 true @@ -3398,7 +3398,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.23.2 + 1.24.0 true @@ -3509,7 +3509,7 @@ curl -i -X GET -G http://localhost:8234 \ org.apache.nifi nifi-record-serialization-services-nar - 1.23.2 + 1.24.0 true diff --git a/scripts/nifi-restart.sh b/scripts/nifi-restart.sh index e7d88c9..85b49f9 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.23.2" +DEFAULT_NIFI_VERSION="1.24.0" NIFI_VERSION="${NIFI_VERSION:-$DEFAULT_NIFI_VERSION}" NIFI_IMAGE=apache/nifi:${NIFI_VERSION} From 633ceba92fc33423c9bf373fabfb9e4f6b7a06d8 Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Mon, 4 Dec 2023 12:15:29 +0100 Subject: [PATCH 3/3] fix: dependency update to avoid: 'java.lang.NoSuchMethodError: org.apache.commons.lang3.Range.of(Ljava/lang/Comparable;Ljava/lang/Comparable;)Lorg/apache/commons/lang3/Range;' --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 292a715..38db8f8 100644 --- a/pom.xml +++ b/pom.xml @@ -212,7 +212,7 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.14.0