Merge pull request #10 from RAVEENSR/master

Issue fixes and siddhi related version bumps
siddhi-io · Mar 29, 2018 · c5ee3b3 · c5ee3b3
2 parents 87a5217 + bf72987
commit c5ee3b3
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 34 deletions.
diff --git a/modules/siddhi-launcher/src/main/java/org/wso2/siddhi/sdk/launcher/run/SiddhiRun.java b/modules/siddhi-launcher/src/main/java/org/wso2/siddhi/sdk/launcher/run/SiddhiRun.java
@@ -37,24 +37,21 @@ public SiddhiRun() {
 
     public void runSiddhi(String siddhiApp, String inputFile) throws InterruptedException {
 
-        while (true) {
-            try {
-                //Generating runtime
-                SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
-
-                //Starting event processing
-                siddhiAppRuntime.start();
-
-                if (!(inputFile == null || inputFile.equalsIgnoreCase(""))) {
-                    InputFeeder inputFeeder = new InputFeeder(siddhiAppRuntime, inputFile);
-                    //starting input feeder
-                    inputFeeder.start();
-                    break;
-                }
-            } catch (Exception e) {
-                log.error("Internal Siddhi Error Occurred: " + e);
-                break;
+        try {
+            //Generating runtime
+            SiddhiAppRuntime siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(siddhiApp);
+
+            //Starting event processing
+            siddhiAppRuntime.start();
+
+            if (!(inputFile == null || inputFile.equalsIgnoreCase(""))) {
+                InputFeeder inputFeeder = new InputFeeder(siddhiAppRuntime, inputFile);
+                //starting input feeder
+                inputFeeder.start();
             }
+        } catch (Throwable e) {
+            log.error("Internal Siddhi Error Occurred: " + e);
         }
+
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -177,6 +177,11 @@
                 <artifactId>siddhi-execution-tensorflow</artifactId>
                 <version>${siddhi.execution.tensorflow.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.extension.siddhi.execution.env</groupId>
+                <artifactId>siddhi-execution-env</artifactId>
+                <version>${siddhi.execution.env.version}</version>
+            </dependency>
             <!--IO Extensions-->
             <dependency>
                 <groupId>org.wso2.extension.siddhi.io.jms</groupId>
@@ -276,6 +281,11 @@
                 <artifactId>siddhi-store-hbase</artifactId>
                 <version>${siddhi.store.hbase.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.extension.siddhi.store.cassandra</groupId>
+                <artifactId>siddhi-store-cassandra</artifactId>
+                <version>${siddhi.store.cassandra.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.extension.siddhi.io.mqtt</groupId>
                 <artifactId>siddhi-io-mqtt</artifactId>
@@ -316,7 +326,7 @@
     </build>
 
     <properties>
-        <siddhi.version>4.1.2</siddhi.version>
+        <siddhi.version>4.1.12</siddhi.version>
         <jcommander.version>1.64</jcommander.version>
         <jackson.core.version>2.7.4</jackson.core.version>
         <jackson.databind.version>2.4.1</jackson.databind.version>
@@ -332,41 +342,43 @@
         <siddhi.execution.string.version>4.0.10</siddhi.execution.string.version>
         <siddhi.execution.extrema.version>4.0.9</siddhi.execution.extrema.version>
         <siddhi.execution.time.version>4.0.10</siddhi.execution.time.version>
-        <siddhi.execution.unique.version>4.0.21</siddhi.execution.unique.version>
+        <siddhi.execution.unique.version>4.0.22</siddhi.execution.unique.version>
         <siddhi.execution.priority.version>4.0.8</siddhi.execution.priority.version>
         <siddhi.execution.markov.version>4.0.10</siddhi.execution.markov.version>
-        <siddhi.execution.geo.version>4.0.8</siddhi.execution.geo.version>
+        <siddhi.execution.geo.version>4.0.9</siddhi.execution.geo.version>
         <siddhi.execution.map.version>4.0.10</siddhi.execution.map.version>
-        <siddhi.execution.sentiment.version>4.0.10</siddhi.execution.sentiment.version>
-        <siddhi.execution.reorder.version>4.0.15</siddhi.execution.reorder.version>
+        <siddhi.execution.sentiment.version>4.0.11</siddhi.execution.sentiment.version>
+        <siddhi.execution.reorder.version>4.0.16</siddhi.execution.reorder.version>
         <siddhi.execution.stats.version>1.0.10</siddhi.execution.stats.version>
         <siddhi.execution.kalmanfilter.version>4.0.9</siddhi.execution.kalmanfilter.version>
-        <siddhi.execution.approximate.version>1.0.11</siddhi.execution.approximate.version>
+        <siddhi.execution.approximate.version>1.0.13</siddhi.execution.approximate.version>
         <siddhi.execution.graph.version>1.0.7</siddhi.execution.graph.version>
         <siddhi.execution.tensorflow.version>1.0.1</siddhi.execution.tensorflow.version>
+        <siddhi.execution.env.version>1.0.1</siddhi.execution.env.version>
 
-        <siddhi.io.file.version>1.0.5</siddhi.io.file.version>
-        <siddhi.io.tcp.version>2.0.13</siddhi.io.tcp.version>
-        <siddhi.io.jms.version>1.0.20</siddhi.io.jms.version>
-        <siddhi.io.email.version>1.0.9</siddhi.io.email.version>
-        <siddhi.io.rabbitmq.version>1.0.13</siddhi.io.rabbitmq.version>
+        <siddhi.io.file.version>1.0.6</siddhi.io.file.version>
+        <siddhi.io.tcp.version>2.0.15</siddhi.io.tcp.version>
+        <siddhi.io.jms.version>1.0.21</siddhi.io.jms.version>
+        <siddhi.io.email.version>1.0.12</siddhi.io.email.version>
+        <siddhi.io.rabbitmq.version>1.0.14</siddhi.io.rabbitmq.version>
         <siddhi.io.mqtt.version>1.0.17</siddhi.io.mqtt.version>
-        <siddhi.io.kafka.version>4.1.3</siddhi.io.kafka.version>
+        <siddhi.io.kafka.version>4.1.5</siddhi.io.kafka.version>
         <siddhi.io.wso2event.version>4.0.12</siddhi.io.wso2event.version>
         <siddhi.io.http.version>1.0.18</siddhi.io.http.version>
 
-        <siddhi.map.json.version>4.0.15</siddhi.map.json.version>
+        <siddhi.map.json.version>4.0.18</siddhi.map.json.version>
         <siddhi.map.wso2event.version>4.0.10</siddhi.map.wso2event.version>
         <siddhi.map.binary.version>1.0.10</siddhi.map.binary.version>
-        <siddhi.map.text.version>1.0.13</siddhi.map.text.version>
+        <siddhi.map.text.version>1.0.14</siddhi.map.text.version>
         <siddhi.map.xml.version>4.0.11</siddhi.map.xml.version>
         <siddhi.map.keyvalue.version>1.0.10</siddhi.map.keyvalue.version>
         <siddhi.map.csv.version>1.0.0</siddhi.map.csv.version>
 
         <siddhi.store.mongodb.version>1.0.13</siddhi.store.mongodb.version>
-        <siddhi.store.rdbms.version>4.0.15</siddhi.store.rdbms.version>
-        <siddhi.store.solr.version>1.0.14</siddhi.store.solr.version>
-        <siddhi.store.hbase.version>4.0.6</siddhi.store.hbase.version>
+        <siddhi.store.rdbms.version>4.0.17</siddhi.store.rdbms.version>
+        <siddhi.store.solr.version>1.0.15</siddhi.store.solr.version>
+        <siddhi.store.hbase.version>4.0.7</siddhi.store.hbase.version>
+        <siddhi.store.cassandra.version>1.0.3</siddhi.store.cassandra.version>
 
         <siddhi.script.js.version>4.0.8</siddhi.script.js.version>