Merge branch 'release/0.13.0'

lmco · Aug 30, 2015 · 5bdf4d7 · 5bdf4d7
2 parents b4681dd + c930dad
commit 5bdf4d7
Show file tree

Hide file tree

Showing 36 changed files with 681 additions and 370 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,4 @@ nbactions.xml
 .DS_Store
 *.DS_Store
 *.iml
-.idea
+.idea/
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>streamflow</groupId>
     <artifactId>streamflow</artifactId>
-    <version>0.12.1</version>
+    <version>0.13.0</version>
     <packaging>pom</packaging>
 
     <name>StreamFlow</name>
@@ -50,7 +50,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- Dependency Versions -->
-        <storm.version>0.9.3</storm.version>
+        <storm.version>0.9.5</storm.version>
         <jetty.version>9.0.0.RC2</jetty.version>
         <jackson.version>2.4.1</jackson.version>
         <jersey.version>1.17.1</jersey.version>
@@ -588,7 +588,7 @@
             <plugin>
                 <groupId>external.atlassian.jgitflow</groupId>
                 <artifactId>jgitflow-maven-plugin</artifactId>
-                <version>1.0-m4.3</version>
+                <version>1.0-m5.1</version>
                 <configuration>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <noDeploy>true</noDeploy>

diff --git a/streamflow-annotations/pom.xml b/streamflow-annotations/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow</artifactId>
-        <version>0.12.1</version>
+        <version>0.13.0</version>
     </parent>
 
     <artifactId>streamflow-annotations</artifactId>

diff --git a/streamflow-core/pom.xml b/streamflow-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow</artifactId>
-        <version>0.12.1</version>
+        <version>0.13.0</version>
     </parent>
 
     <artifactId>streamflow-core</artifactId>

diff --git a/streamflow-core/streamflow-app/pom.xml b/streamflow-core/streamflow-app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-core</artifactId>
-        <version>0.12.1</version>
+        <version>0.13.0</version>
     </parent>
 
     <artifactId>streamflow-app</artifactId>

diff --git a/streamflow-core/streamflow-app/streamflow-app-jar/pom.xml b/streamflow-core/streamflow-app/streamflow-app-jar/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-app</artifactId>
-        <version>0.12.1</version>
+        <version>0.13.0</version>
     </parent>
 
     <artifactId>streamflow-app-jar</artifactId>

diff --git a/streamflow-core/streamflow-app/streamflow-app-war/pom.xml b/streamflow-core/streamflow-app/streamflow-app-war/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-app</artifactId>
-        <version>0.12.1</version>
+        <version>0.13.0</version>
     </parent>
 
     <artifactId>streamflow-app-war</artifactId>

diff --git a/streamflow-core/streamflow-datastore/pom.xml b/streamflow-core/streamflow-datastore/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-core</artifactId>
-        <version>0.12.1</version>
+        <version>0.13.0</version>
     </parent>
 
     <artifactId>streamflow-datastore</artifactId>

diff --git a/streamflow-core/streamflow-datastore/streamflow-datastore-core/pom.xml b/streamflow-core/streamflow-datastore/streamflow-datastore-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-datastore</artifactId>
-        <version>0.12.1</version>
+        <version>0.13.0</version>
     </parent>
 
     <artifactId>streamflow-datastore-core</artifactId>

diff --git a/streamflow-core/streamflow-datastore/streamflow-datastore-jdbc/pom.xml b/streamflow-core/streamflow-datastore/streamflow-datastore-jdbc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-datastore</artifactId>
-        <version>0.12.1</version>
+        <version>0.13.0</version>
     </parent>
 
     <artifactId>streamflow-datastore-jdbc</artifactId>

diff --git a/streamflow-core/streamflow-datastore/streamflow-datastore-mongodb/pom.xml b/streamflow-core/streamflow-datastore/streamflow-datastore-mongodb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-datastore</artifactId>
-        <version>0.12.1</version>
+        <version>0.13.0</version>
     </parent>
 
     <artifactId>streamflow-datastore-mongodb</artifactId>

diff --git a/streamflow-core/streamflow-engine/pom.xml b/streamflow-core/streamflow-engine/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-core</artifactId>
-        <version>0.12.1</version>
+        <version>0.13.0</version>
     </parent>
 
     <artifactId>streamflow-engine</artifactId>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>13.0</version>
+            <version>18.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>