feat: update NiFi to 1.12.1, InfluxDB v1 to 1.8, Chronograf to 1.7, i…

…nfluxdb-client-java to 1.11.0 and influxdb-java to 2.20 (#38)
influxdata · Oct 1, 2020 · 42ee05b · 42ee05b
1 parent ed2c293
commit 42ee05b
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@
 ### API
 * [#36](https://github.com/influxdata/nifi-influxdb-bundle/pull/36): Default port changed from 9999 -> 8086
 
+### Others
+* [38](https://github.com/influxdata/nifi-influxdb-bundle/pull/38): Updated NiFi to 1.12.1, InfluxDB v1 to 1.8, Chronograf to 1.7, influxdb-client-java to 1.11.0 and influxdb-java to 2.20
+
 ## v1.7.0 [2020-04-17]
 
 ### Others

diff --git a/README.md b/README.md
@@ -61,7 +61,7 @@ The Nar compatibility matrix:
 
 Nar Version                                                                                                                             | NiFi Version
 ----------------------------------------------------------------------------------------------------------------------------------------| ------------
-[nifi-influx-database-nar-1.8.0-SNAPSHOT.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.8.0-SNAPSHOT/nifi-influx-database-nar-1.8.0-SNAPSHOT.nar)  | 1.11.4
+[nifi-influx-database-nar-1.8.0-SNAPSHOT.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.8.0-SNAPSHOT/nifi-influx-database-nar-1.8.0-SNAPSHOT.nar)  | 1.12.1
 [nifi-influx-database-nar-1.7.0.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.7.0/nifi-influx-database-nar-1.7.0.nar)  | 1.11.4
 [nifi-influx-database-nar-1.6.0.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.6.0/nifi-influx-database-nar-1.6.0.nar)  | 1.11.3
 [nifi-influx-database-nar-1.5.0.nar](https://github.com/influxdata/nifi-influxdb-bundle/releases/download/v1.5.0/nifi-influx-database-nar-1.5.0.nar)  | 1.11.1

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.11.4</version>
+        <version>1.12.1</version>
     </parent>
 
     <artifactId>nifi-influx-database-bundle</artifactId>
@@ -100,8 +100,10 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<!-- skip until remove org.json from Java client -->
+        <enforcer.skip>true</enforcer.skip>
 
-        <nifi.version>1.11.4</nifi.version>
+        <nifi.version>1.12.1</nifi.version>
 
         <plugin.surefire.version>2.22.0</plugin.surefire.version>
         <plugin.jacoco.version>0.8.2</plugin.jacoco.version>
@@ -204,13 +206,13 @@
             <dependency>
                 <groupId>org.influxdb</groupId>
                 <artifactId>influxdb-java</artifactId>
-                <version>2.17</version>
+                <version>2.20</version>
             </dependency>
 
             <dependency>
                 <groupId>com.influxdb</groupId>
                 <artifactId>influxdb-client-java</artifactId>
-                <version>1.4.0</version>
+                <version>1.11.0</version>
             </dependency>
 
             <dependency>

diff --git a/scripts/Dockerfile b/scripts/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-ARG NIFI_IMAGE=apache/nifi:1.11.4
+ARG NIFI_IMAGE=apache/nifi:1.12.1
 
 FROM $NIFI_IMAGE
 

diff --git a/scripts/flow.xml b/scripts/flow.xml
@@ -212,7 +212,7 @@ Set as Line Protocol.</value>
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -245,7 +245,7 @@ Set as Line Protocol.</value>
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -281,7 +281,7 @@ Set as Line Protocol.</value>
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -382,7 +382,7 @@ Set as Line Protocol.</value>
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -429,7 +429,7 @@ Set as Line Protocol.</value>
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -468,7 +468,7 @@ Set as Line Protocol.</value>
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -501,7 +501,7 @@ Set as Line Protocol.</value>
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -537,7 +537,7 @@ Set as Line Protocol.</value>
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -570,7 +570,7 @@ Set as Line Protocol.</value>
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -657,7 +657,7 @@ Set as Line Protocol.</value>
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -744,7 +744,7 @@ Set as Line Protocol.</value>
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -780,7 +780,7 @@ Set as Line Protocol.</value>
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -1190,7 +1190,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-http-context-map-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -1210,7 +1210,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -1286,7 +1286,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-http-context-map-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -1306,7 +1306,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -1343,7 +1343,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -1438,7 +1438,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -1507,7 +1507,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -1655,7 +1655,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -1707,7 +1707,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-social-media-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -2042,7 +2042,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>5 sec</schedulingPeriod>
@@ -2099,7 +2099,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -2143,15 +2143,15 @@ curl -i -X GET -G http://localhost:8234 \
       </processor>
       <processor>
         <id>0da4cb96-016b-1000-471a-93377cc20d0d</id>
-        <name>PublishKafka_0_10</name>
+        <name>PublishKafka_0_11</name>
         <position x="1047.893615619313" y="682.185540679174"/>
         <styles/>
         <comment/>
-        <class>org.apache.nifi.processors.kafka.pubsub.PublishKafka_0_10</class>
+        <class>org.apache.nifi.processors.kafka.pubsub.PublishKafka_0_11</class>
         <bundle>
           <group>org.apache.nifi</group>
-          <artifact>nifi-kafka-0-10-nar</artifact>
-          <version>1.11.4</version>
+          <artifact>nifi-kafka-0-11-nar</artifact>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -2194,6 +2194,10 @@ curl -i -X GET -G http://localhost:8234 \
           <name>acks</name>
           <value>0</value>
         </property>
+        <property>
+          <name>use-transactions</name>
+          <value>false</value>
+        </property>
         <property>
           <name>kafka-key</name>
         </property>
@@ -2236,7 +2240,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-update-attribute-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -2394,7 +2398,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -2659,7 +2663,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -2781,7 +2785,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-record-serialization-services-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -2826,7 +2830,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-registry-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <enabled>true</enabled>
         <property>
@@ -2868,7 +2872,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -2921,7 +2925,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -3069,7 +3073,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>
@@ -3192,7 +3196,7 @@ curl -i -X GET -G http://localhost:8234 \
         <bundle>
           <group>org.apache.nifi</group>
           <artifact>nifi-standard-nar</artifact>
-          <version>1.11.4</version>
+          <version>1.12.1</version>
         </bundle>
         <maxConcurrentTasks>1</maxConcurrentTasks>
         <schedulingPeriod>0 sec</schedulingPeriod>

diff --git a/scripts/influxdb-restart.sh b/scripts/influxdb-restart.sh
@@ -26,7 +26,7 @@ set -e
 DEFAULT_DOCKER_REGISTRY="quay.io/influxdb/"
 DOCKER_REGISTRY="${DOCKER_REGISTRY:-$DEFAULT_DOCKER_REGISTRY}"
 
-DEFAULT_INFLUXDB_VERSION="1.7"
+DEFAULT_INFLUXDB_VERSION="1.8"
 INFLUXDB_VERSION="${INFLUXDB_VERSION:-$DEFAULT_INFLUXDB_VERSION}"
 INFLUXDB_IMAGE=influxdb:${INFLUXDB_VERSION}-alpine