From ce2b68498add493f86b35c4f7b98e27629838c90 Mon Sep 17 00:00:00 2001 From: minudika Date: Mon, 18 Mar 2019 11:29:07 +0530 Subject: [PATCH 1/3] Fix file path in file sink --- .../PublishEventsToFile/PublishEventsToFile.siddhi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/samples/artifacts/PublishEventsToFile/PublishEventsToFile.siddhi b/modules/samples/artifacts/PublishEventsToFile/PublishEventsToFile.siddhi index 015304618..dad44b864 100644 --- a/modules/samples/artifacts/PublishEventsToFile/PublishEventsToFile.siddhi +++ b/modules/samples/artifacts/PublishEventsToFile/PublishEventsToFile.siddhi @@ -35,14 +35,16 @@ Testing the Sample: 9) Send event Viewing the Results: - Navigate to the path defined by file.uri ({WSO2SPHome}/samples/artifacts/0038/files/sink), where you can see a .txt file named after the event (e.g., toffees.txt) and open it. You can see the data events that you sent: + Navigate to the path defined by file.uri ({WSO2SPHome}/samples/artifacts/0038/files/sink), + where you can see a .txt file named after the event (e.g., toffees.txt) and open it. + You can see the data events that you sent: {"event":{"name":"toffees","amount":66.71}} {"event":{"name":"toffees","amount":200.0}} */ define stream SweetProductionStream (name string, amount double); -@sink(type='file', @map(type='json'), file.uri='{WSO2SPHome}/samples/artifacts/0038/files/sink/{{name}}.txt') +@sink(type='file', @map(type='json'), file.uri='{WSO2SPHome}/samples/artifacts/PublishEventsToFile/files/sink/{{name}}.txt') define stream LowProductionAlertStream (name string, amount double); @info(name='query1') From 270d84a7b96f38a605c5694ad44a97cd47bdb85c Mon Sep 17 00:00:00 2001 From: minudika Date: Fri, 22 Mar 2019 13:54:42 +0530 Subject: [PATCH 2/3] Bundle siddhi-store-influxdb extension --- modules/distribution/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 325c501f7..dd737c9d6 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -750,6 +750,12 @@ ${siddhi.store.elasticsearch.version} jar + + org.wso2.extension.siddhi.store.influxdb + siddhi-store-influxdb + ${siddhi.store.influxdb.version} + jar + org.wso2.extension.siddhi.io.sqs siddhi-io-sqs From 91944442eec3b7df6799a0cfcf547edf1cd08e0a Mon Sep 17 00:00:00 2001 From: minudika Date: Fri, 22 Mar 2019 15:18:59 +0530 Subject: [PATCH 3/3] Update dependency versions and prepare for 4.4.0-beta2 release --- modules/distribution/pom.xml | 2 +- modules/integration/pom.xml | 2 +- modules/performance/pom.xml | 2 +- .../samples/sample-clients/apim-event-client/pom.xml | 2 +- .../sample-clients/ei-analytics-client/pom.xml | 2 +- modules/samples/sample-clients/http-client/pom.xml | 2 +- modules/samples/sample-clients/http-server/pom.xml | 2 +- .../sample-clients/is-analytics-client/pom.xml | 2 +- modules/samples/sample-clients/jms-consumer/pom.xml | 2 +- modules/samples/sample-clients/jms-producer/pom.xml | 2 +- .../sample-clients/kafka-avro-consumer/pom.xml | 2 +- modules/samples/sample-clients/kafka-consumer/pom.xml | 2 +- modules/samples/sample-clients/kafka-producer/pom.xml | 2 +- modules/samples/sample-clients/mqtt-client/pom.xml | 2 +- modules/samples/sample-clients/mqtt-consumer/pom.xml | 2 +- modules/samples/sample-clients/pom.xml | 2 +- .../samples/sample-clients/prometheus-client/pom.xml | 2 +- .../samples/sample-clients/rabbitmq-consumer/pom.xml | 2 +- .../samples/sample-clients/rabbitmq-producer/pom.xml | 2 +- modules/samples/sample-clients/tcp-client/pom.xml | 2 +- modules/samples/sample-clients/tcp-server/pom.xml | 2 +- .../samples/sample-clients/websocket-producer/pom.xml | 2 +- .../samples/sample-clients/websocket-receiver/pom.xml | 2 +- .../samples/sample-clients/wso2event-client/pom.xml | 2 +- .../samples/sample-clients/wso2event-server/pom.xml | 2 +- modules/tests/pom.xml | 2 +- pom.xml | 11 ++++++----- 27 files changed, 32 insertions(+), 31 deletions(-) diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index dd737c9d6..4f9944845 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.sp org.wso2.carbon.sp.parent - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index b67d09fe3..d2ea2501a 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp org.wso2.carbon.sp.parent - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../../pom.xml diff --git a/modules/performance/pom.xml b/modules/performance/pom.xml index 1cb3bf5ca..720f04e75 100644 --- a/modules/performance/pom.xml +++ b/modules/performance/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp org.wso2.carbon.sp.parent - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../../pom.xml diff --git a/modules/samples/sample-clients/apim-event-client/pom.xml b/modules/samples/sample-clients/apim-event-client/pom.xml index 58fb0ce35..2f2db3b7b 100644 --- a/modules/samples/sample-clients/apim-event-client/pom.xml +++ b/modules/samples/sample-clients/apim-event-client/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/ei-analytics-client/pom.xml b/modules/samples/sample-clients/ei-analytics-client/pom.xml index b886c8c1a..6a53958f6 100644 --- a/modules/samples/sample-clients/ei-analytics-client/pom.xml +++ b/modules/samples/sample-clients/ei-analytics-client/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/http-client/pom.xml b/modules/samples/sample-clients/http-client/pom.xml index cd683ebf8..1b0ad4140 100644 --- a/modules/samples/sample-clients/http-client/pom.xml +++ b/modules/samples/sample-clients/http-client/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/http-server/pom.xml b/modules/samples/sample-clients/http-server/pom.xml index cdde29b81..3517b8b00 100644 --- a/modules/samples/sample-clients/http-server/pom.xml +++ b/modules/samples/sample-clients/http-server/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/is-analytics-client/pom.xml b/modules/samples/sample-clients/is-analytics-client/pom.xml index 1051cdde7..735f14528 100644 --- a/modules/samples/sample-clients/is-analytics-client/pom.xml +++ b/modules/samples/sample-clients/is-analytics-client/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/jms-consumer/pom.xml b/modules/samples/sample-clients/jms-consumer/pom.xml index efcf338bd..a0c15095c 100644 --- a/modules/samples/sample-clients/jms-consumer/pom.xml +++ b/modules/samples/sample-clients/jms-consumer/pom.xml @@ -21,7 +21,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/jms-producer/pom.xml b/modules/samples/sample-clients/jms-producer/pom.xml index 8b1b789e3..9f801138d 100644 --- a/modules/samples/sample-clients/jms-producer/pom.xml +++ b/modules/samples/sample-clients/jms-producer/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/kafka-avro-consumer/pom.xml b/modules/samples/sample-clients/kafka-avro-consumer/pom.xml index 3e653350e..dbdbd8d85 100644 --- a/modules/samples/sample-clients/kafka-avro-consumer/pom.xml +++ b/modules/samples/sample-clients/kafka-avro-consumer/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/kafka-consumer/pom.xml b/modules/samples/sample-clients/kafka-consumer/pom.xml index c5a62254d..081b5b854 100644 --- a/modules/samples/sample-clients/kafka-consumer/pom.xml +++ b/modules/samples/sample-clients/kafka-consumer/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/kafka-producer/pom.xml b/modules/samples/sample-clients/kafka-producer/pom.xml index e8fc22d70..fc4bc90be 100644 --- a/modules/samples/sample-clients/kafka-producer/pom.xml +++ b/modules/samples/sample-clients/kafka-producer/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/mqtt-client/pom.xml b/modules/samples/sample-clients/mqtt-client/pom.xml index 98c363c06..667f7bfc0 100644 --- a/modules/samples/sample-clients/mqtt-client/pom.xml +++ b/modules/samples/sample-clients/mqtt-client/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/mqtt-consumer/pom.xml b/modules/samples/sample-clients/mqtt-consumer/pom.xml index 0f84612de..4599fe197 100644 --- a/modules/samples/sample-clients/mqtt-consumer/pom.xml +++ b/modules/samples/sample-clients/mqtt-consumer/pom.xml @@ -21,7 +21,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/pom.xml b/modules/samples/sample-clients/pom.xml index c5a140711..dccb377d5 100644 --- a/modules/samples/sample-clients/pom.xml +++ b/modules/samples/sample-clients/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp org.wso2.carbon.sp.parent - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../../../pom.xml diff --git a/modules/samples/sample-clients/prometheus-client/pom.xml b/modules/samples/sample-clients/prometheus-client/pom.xml index 5af88d3fd..816095e08 100644 --- a/modules/samples/sample-clients/prometheus-client/pom.xml +++ b/modules/samples/sample-clients/prometheus-client/pom.xml @@ -20,7 +20,7 @@ sample-clients org.wso2.sp - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT 4.0.0 diff --git a/modules/samples/sample-clients/rabbitmq-consumer/pom.xml b/modules/samples/sample-clients/rabbitmq-consumer/pom.xml index 37100fc12..34f8a4d64 100644 --- a/modules/samples/sample-clients/rabbitmq-consumer/pom.xml +++ b/modules/samples/sample-clients/rabbitmq-consumer/pom.xml @@ -21,7 +21,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/rabbitmq-producer/pom.xml b/modules/samples/sample-clients/rabbitmq-producer/pom.xml index 9febe9ca0..6312bb460 100644 --- a/modules/samples/sample-clients/rabbitmq-producer/pom.xml +++ b/modules/samples/sample-clients/rabbitmq-producer/pom.xml @@ -21,7 +21,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/tcp-client/pom.xml b/modules/samples/sample-clients/tcp-client/pom.xml index acb37ec87..28e9755ce 100644 --- a/modules/samples/sample-clients/tcp-client/pom.xml +++ b/modules/samples/sample-clients/tcp-client/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/tcp-server/pom.xml b/modules/samples/sample-clients/tcp-server/pom.xml index f43ca857c..320196a0d 100644 --- a/modules/samples/sample-clients/tcp-server/pom.xml +++ b/modules/samples/sample-clients/tcp-server/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/websocket-producer/pom.xml b/modules/samples/sample-clients/websocket-producer/pom.xml index ff5f1f305..c59ed2afe 100644 --- a/modules/samples/sample-clients/websocket-producer/pom.xml +++ b/modules/samples/sample-clients/websocket-producer/pom.xml @@ -20,7 +20,7 @@ sample-clients org.wso2.sp - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT 4.0.0 WSO2 Stream Processor - Sample - WebSocket Client diff --git a/modules/samples/sample-clients/websocket-receiver/pom.xml b/modules/samples/sample-clients/websocket-receiver/pom.xml index 65439e6c0..6b3b51bc2 100644 --- a/modules/samples/sample-clients/websocket-receiver/pom.xml +++ b/modules/samples/sample-clients/websocket-receiver/pom.xml @@ -20,7 +20,7 @@ sample-clients org.wso2.sp - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT 4.0.0 WSO2 Stream Processor - Sample - WebSocket Consumer diff --git a/modules/samples/sample-clients/wso2event-client/pom.xml b/modules/samples/sample-clients/wso2event-client/pom.xml index 34ce58f20..c34d7e70a 100644 --- a/modules/samples/sample-clients/wso2event-client/pom.xml +++ b/modules/samples/sample-clients/wso2event-client/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/samples/sample-clients/wso2event-server/pom.xml b/modules/samples/sample-clients/wso2event-server/pom.xml index 068c61bef..a5c21a496 100644 --- a/modules/samples/sample-clients/wso2event-server/pom.xml +++ b/modules/samples/sample-clients/wso2event-server/pom.xml @@ -22,7 +22,7 @@ org.wso2.sp sample-clients - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../pom.xml diff --git a/modules/tests/pom.xml b/modules/tests/pom.xml index 83dab05f1..2d0e10f47 100644 --- a/modules/tests/pom.xml +++ b/modules/tests/pom.xml @@ -20,7 +20,7 @@ org.wso2.sp org.wso2.carbon.sp.parent - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 81b811ee0..dcc652a1f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.wso2.sp org.wso2.carbon.sp.parent pom - 4.4.1-beta-SNAPSHOT + 4.4.0-beta2-SNAPSHOT WSO2 Stream Processor - Parent http://wso2.org @@ -1310,11 +1310,11 @@ - 2.0.496 + 2.0.497 4.4.10 6.1.1 - 1.0.32 + 1.0.34 2.5.4 @@ -1343,7 +1343,7 @@ 5.2.0 1.1.4 - 2.3.7 + 2.3.8 1.0.5 1.1.3 @@ -1359,7 +1359,7 @@ 4.5.1.wso2v1 - 4.0.56 + 4.0.57 0.19.7 1.5.0 @@ -1486,6 +1486,7 @@ 1.1.0 2.1.0 1.1.0 + 1.0.1 4.1.0