diff --git a/nifi-ngsi-bundle/nifi-ngsi-bundle.iml b/nifi-ngsi-bundle/nifi-ngsi-bundle.iml
index 2a84d2e..e2d9e5f 100644
--- a/nifi-ngsi-bundle/nifi-ngsi-bundle.iml
+++ b/nifi-ngsi-bundle/nifi-ngsi-bundle.iml
@@ -8,15 +8,23 @@
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nifi-ngsi-bundle/nifi-ngsi-nar/nifi-ngsi-nar.iml b/nifi-ngsi-bundle/nifi-ngsi-nar/nifi-ngsi-nar.iml
index 1a2c061..9e971ba 100644
--- a/nifi-ngsi-bundle/nifi-ngsi-nar/nifi-ngsi-nar.iml
+++ b/nifi-ngsi-bundle/nifi-ngsi-nar/nifi-ngsi-nar.iml
@@ -19,7 +19,6 @@
-
@@ -34,18 +33,18 @@
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
@@ -64,72 +63,86 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
@@ -150,45 +163,52 @@
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nifi-ngsi-bundle/nifi-ngsi-nar/pom.xml b/nifi-ngsi-bundle/nifi-ngsi-nar/pom.xml
index c4a44e9..d868974 100644
--- a/nifi-ngsi-bundle/nifi-ngsi-nar/pom.xml
+++ b/nifi-ngsi-bundle/nifi-ngsi-nar/pom.xml
@@ -19,11 +19,11 @@
org.apache.nifi
nifi-ngsi-bundle
- 1.3.7
+ 2.0.0
nifi-ngsi-nar
- 1.3.7
+ 2.0.0
nar
true
@@ -34,7 +34,7 @@
org.apache.nifi
nifi-ngsi-processors
- 1.3.7
+ 2.0.0
diff --git a/nifi-ngsi-bundle/nifi-ngsi-processors/nifi-ngsi-processors.iml b/nifi-ngsi-bundle/nifi-ngsi-processors/nifi-ngsi-processors.iml
index d8a1231..fecb993 100644
--- a/nifi-ngsi-bundle/nifi-ngsi-processors/nifi-ngsi-processors.iml
+++ b/nifi-ngsi-bundle/nifi-ngsi-processors/nifi-ngsi-processors.iml
@@ -32,21 +32,25 @@
-
+
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
@@ -65,138 +69,149 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
@@ -217,37 +232,47 @@
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nifi-ngsi-bundle/nifi-ngsi-processors/pom.xml b/nifi-ngsi-bundle/nifi-ngsi-processors/pom.xml
index be7ab0c..7dd9a30 100644
--- a/nifi-ngsi-bundle/nifi-ngsi-processors/pom.xml
+++ b/nifi-ngsi-bundle/nifi-ngsi-processors/pom.xml
@@ -19,14 +19,14 @@
org.apache.nifi
nifi-ngsi-bundle
- 1.3.7
+ 2.0.0
nifi-ngsi-processors
jar
3.12.7
- 1.13.0
+ 1.15.0
@@ -213,7 +213,7 @@
org.apache.nifi
nifi-database-utils
- 1.13.0
+ 1.15.0
@@ -230,7 +230,7 @@
org.apache.hadoop
hadoop-client
- 3.3.0
+ 3.3.1
diff --git a/nifi-ngsi-bundle/nifi-ngsi-processors/src/main/java/org/apache/nifi/processors/ngsi/NGSIToPostgreSQL.java b/nifi-ngsi-bundle/nifi-ngsi-processors/src/main/java/org/apache/nifi/processors/ngsi/NGSIToPostgreSQL.java
index 19ecaac..9522199 100755
--- a/nifi-ngsi-bundle/nifi-ngsi-processors/src/main/java/org/apache/nifi/processors/ngsi/NGSIToPostgreSQL.java
+++ b/nifi-ngsi-bundle/nifi-ngsi-processors/src/main/java/org/apache/nifi/processors/ngsi/NGSIToPostgreSQL.java
@@ -270,11 +270,11 @@ void apply(final ProcessContext context, final ProcessSession session, final Fun
System.out.println(postgres.checkColumnNames(tableName));
conn.createStatement().execute(postgres.createSchema(schemaName));
conn.createStatement().execute(postgres.createTable(schemaName, tableName,listOfFields));
- ResultSet rs = conn.createStatement().executeQuery(postgres.checkColumnNames(tableName));
+ /*ResultSet rs = conn.createStatement().executeQuery(postgres.checkColumnNames(tableName));
newColumns = postgres.getNewColumns(rs,listOfFields);
if (newColumns.size()>0){
conn.createStatement().execute(postgres.addColumns(schemaName,tableName,newColumns));
- }
+ }*/
System.out.println(schemaName+"."+tableName+" columns -------- : ");
} catch (SQLException s) {
diff --git a/nifi-ngsi-bundle/nifi-ngsi-processors/src/main/java/org/apache/nifi/processors/ngsi/ngsi/backends/PostgreSQLBackend.java b/nifi-ngsi-bundle/nifi-ngsi-processors/src/main/java/org/apache/nifi/processors/ngsi/ngsi/backends/PostgreSQLBackend.java
index c2fa4a3..0280cb7 100755
--- a/nifi-ngsi-bundle/nifi-ngsi-processors/src/main/java/org/apache/nifi/processors/ngsi/ngsi/backends/PostgreSQLBackend.java
+++ b/nifi-ngsi-bundle/nifi-ngsi-processors/src/main/java/org/apache/nifi/processors/ngsi/ngsi/backends/PostgreSQLBackend.java
@@ -201,13 +201,16 @@ public String buildSchemaName(String service,boolean enableEncoding,boolean enab
public String createSchema(String schemaName) {
String query = "create schema if not exists " + schemaName + ";";
+ System.out.println(query);
return query;
}
public String createTable(String schemaName,String tableName, ArrayList listOfFields){
String query= "create table if not exists "+schemaName+"." + tableName + " " + getFieldsForCreate(listOfFields) + ";";
+ System.out.println(query);
return query;
+
}
public String buildTableName(String fiwareServicePath,Entity entity, String dataModel, boolean enableEncoding, boolean enableLowercase, String ngsiVersion, boolean ckanCompatible)throws Exception{
diff --git a/nifi-ngsi-bundle/pom.xml b/nifi-ngsi-bundle/pom.xml
index 7e4ef94..007d5a4 100644
--- a/nifi-ngsi-bundle/pom.xml
+++ b/nifi-ngsi-bundle/pom.xml
@@ -18,12 +18,12 @@
org.apache.nifi
nifi-nar-bundles
- 1.13.0
+ 1.15.0
org.apache.nifi
nifi-ngsi-bundle
- 1.3.7
+ 2.0.0
pom
@@ -38,7 +38,7 @@
org.apache.nifi
nifi-nar-maven-plugin
- 1.3.2
+ 1.3.3
true
diff --git a/nifi-ngsi-cassandra/nifi-ngsi-cassandra-nar/pom.xml b/nifi-ngsi-cassandra/nifi-ngsi-cassandra-nar/pom.xml
index 4558004..baefe7c 100644
--- a/nifi-ngsi-cassandra/nifi-ngsi-cassandra-nar/pom.xml
+++ b/nifi-ngsi-cassandra/nifi-ngsi-cassandra-nar/pom.xml
@@ -19,11 +19,11 @@
nifi-ngsi-cassandra
nifi-ngsi-cassandra-bundle
- 1.3.7
+ 2.0.0
nifi-ngsi-cassandra-nar
- 1.3.7
+ 2.0.0
nar
true
@@ -34,12 +34,12 @@
nifi-ngsi-cassandra
nifi-ngsi-cassandra-processors
- 1.3.7
+ 2.0.0
org.apache.nifi
nifi-cassandra-services-api-nar
- 1.13.0
+ 1.15.0
nar
diff --git a/nifi-ngsi-cassandra/nifi-ngsi-cassandra-processors/pom.xml b/nifi-ngsi-cassandra/nifi-ngsi-cassandra-processors/pom.xml
index ee6d00b..076f972 100644
--- a/nifi-ngsi-cassandra/nifi-ngsi-cassandra-processors/pom.xml
+++ b/nifi-ngsi-cassandra/nifi-ngsi-cassandra-processors/pom.xml
@@ -19,10 +19,10 @@
nifi-ngsi-cassandra
nifi-ngsi-cassandra-bundle
- 1.3.7
+ 2.0.0
- 1.13.0
+ 1.15.0
nifi-ngsi-cassandra-processors
@@ -55,9 +55,9 @@
test
- com.datastax.cassandra
- cassandra-driver-core
- 3.3.0
+ com.datastax.oss
+ java-driver-core
+ 4.13.0
org.apache.nifi
@@ -68,7 +68,7 @@
org.apache.nifi
nifi-ngsi-processors
- 1.3.6
+ 2.0.0
provided
diff --git a/nifi-ngsi-cassandra/pom.xml b/nifi-ngsi-cassandra/pom.xml
index b418cf3..148d26c 100644
--- a/nifi-ngsi-cassandra/pom.xml
+++ b/nifi-ngsi-cassandra/pom.xml
@@ -19,12 +19,12 @@
org.apache.nifi
nifi-nar-bundles
- 1.13.0
+ 1.15.0
nifi-ngsi-cassandra
nifi-ngsi-cassandra-bundle
- 1.3.7
+ 2.0.0
pom
@@ -37,7 +37,7 @@
org.apache.nifi
nifi-nar-maven-plugin
- 1.3.2
+ 1.3.3
true
diff --git a/nifi-ngsi-dynamo/nifi-ngsi-dynamo-nar/pom.xml b/nifi-ngsi-dynamo/nifi-ngsi-dynamo-nar/pom.xml
index 634494e..aa62258 100644
--- a/nifi-ngsi-dynamo/nifi-ngsi-dynamo-nar/pom.xml
+++ b/nifi-ngsi-dynamo/nifi-ngsi-dynamo-nar/pom.xml
@@ -19,11 +19,11 @@
org.apache.nifi
nifi-ngsi-dynamodb-bundle
- 1.3.7
+ 2.0.0
nifi-ngsi-dynamo-nar
- 1.3.7
+ 2.0.0
nar
true
@@ -34,12 +34,12 @@
org.apache.nifi
nifi-ngsi-dynamo-processors
- 1.3.7
+ 2.0.0
org.apache.nifi
nifi-aws-service-api-nar
- 1.13.0
+ 1.15.0
nar
diff --git a/nifi-ngsi-dynamo/nifi-ngsi-dynamo-processors/pom.xml b/nifi-ngsi-dynamo/nifi-ngsi-dynamo-processors/pom.xml
index 6c9e504..90b2266 100644
--- a/nifi-ngsi-dynamo/nifi-ngsi-dynamo-processors/pom.xml
+++ b/nifi-ngsi-dynamo/nifi-ngsi-dynamo-processors/pom.xml
@@ -19,14 +19,14 @@
org.apache.nifi
nifi-ngsi-dynamodb-bundle
- 1.3.7
+ 2.0.0
nifi-ngsi-dynamo-processors
jar
- 1.13.0
+ 1.15.0
@@ -88,7 +88,7 @@
org.apache.nifi
nifi-ngsi-processors
- 1.3.6
+ 2.0.0
provided
diff --git a/nifi-ngsi-dynamo/pom.xml b/nifi-ngsi-dynamo/pom.xml
index 3993232..4f15711 100644
--- a/nifi-ngsi-dynamo/pom.xml
+++ b/nifi-ngsi-dynamo/pom.xml
@@ -19,12 +19,12 @@
org.apache.nifi
nifi-nar-bundles
- 1.13.0
+ 1.15.0
org.apache.nifi
nifi-ngsi-dynamodb-bundle
- 1.3.7
+ 2.0.0
pom
@@ -37,7 +37,7 @@
org.apache.nifi
nifi-nar-maven-plugin
- 1.3.2
+ 1.3.3
true
diff --git a/nifi-ngsi-resources/docker/Dockerfile b/nifi-ngsi-resources/docker/Dockerfile
index c96fd3d..a9c449b 100644
--- a/nifi-ngsi-resources/docker/Dockerfile
+++ b/nifi-ngsi-resources/docker/Dockerfile
@@ -5,7 +5,7 @@ LABEL site="https://github.com/ging/fiware-draco"
ARG UID=1000
ARG GID=1000
-ARG NIFI_VERSION=1.13.0
+ARG NIFI_VERSION=1.15.0
ARG BASE_URL=https://archive.apache.org/dist
ARG MIRROR_BASE_URL=${MIRROR_BASE_URL:-${BASE_URL}}
ARG NIFI_BINARY_PATH=${NIFI_BINARY_PATH:-/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-bin.zip}
@@ -18,8 +18,8 @@ ENV NIFI_TOOLKIT_HOME ${NIFI_BASE_DIR}/nifi-toolkit-current
ENV NIFI_PID_DIR=${NIFI_HOME}/run
ENV NIFI_LOG_DIR=${NIFI_HOME}/logs
-ENV DRACO_RELEASE=1.3.7
-ENV NIFI_NGSI_NAR_VERSION=1.3.7
+ENV DRACO_RELEASE=2.0.0
+ENV NIFI_NGSI_NAR_VERSION=2.0.0
ADD sh/ ${NIFI_BASE_DIR}/scripts/
diff --git a/nifi-ngsi-resources/docker/ngsi-ld-notification.sh b/nifi-ngsi-resources/docker/ngsi-ld-notification.sh
index 3a71ce5..00fe99f 100755
--- a/nifi-ngsi-resources/docker/ngsi-ld-notification.sh
+++ b/nifi-ngsi-resources/docker/ngsi-ld-notification.sh
@@ -1,11 +1,11 @@
-curl -X POST 'http://localhost:5050/ld/notify' -H 'Content-Type: application/ld+json' -H 'Fiware-service: UPM2' -d @- <