Merge branch 'release/0.11.0'

lmco · Apr 20, 2015 · d5a2838 · d5a2838
2 parents 2355a48 + 8b4a52b
commit d5a2838
Show file tree

Hide file tree

Showing 19 changed files with 34 additions and 27 deletions.
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>streamflow</groupId>
     <artifactId>streamflow</artifactId>
-    <version>0.10.1</version>
+    <version>0.11.0</version>
     <packaging>pom</packaging>
 
     <name>StreamFlow</name>

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.10.1</version>
+        <version>0.11.0</version>
     </parent>
 
     <artifactId>framework-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.10.1</version>
+        <version>0.11.0</version>
     </parent>
 
     <artifactId>streamflow-core</artifactId>
@@ -38,4 +38,4 @@
         <module>streamflow-server</module>
         <module>streamflow-app</module>
     </modules>
-<version xmlns="">0.10.1</version></project>
+</project>
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.10.1</version>
+        <version>0.11.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.10.1</version>
+        <version>0.11.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.10.1</version>
+        <version>0.11.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.10.1</version>
+        <version>0.11.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.10.1</version>
+        <version>0.11.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.10.1</version>
+        <version>0.11.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.10.1</version>
+        <version>0.11.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.10.1</version>
+        <version>0.11.0</version>
     </parent>
 
     <artifactId>streamflow-engine</artifactId>

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

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

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

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

diff --git a/streamflow-dist/pom.xml b/streamflow-dist/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow</artifactId>
-        <version>0.10.1</version>
+        <version>0.11.0</version>
     </parent>
 
     <artifactId>streamflow-dist</artifactId>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>streamflow</groupId>
             <artifactId>streamflow-app-jar</artifactId>
-            <version>0.10.1</version>
+            <version>${project.version}</version>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>streamflow</groupId>
             <artifactId>streamflow-app-war</artifactId>
-            <version>0.10.1</version>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
         <dependency>

diff --git a/streamflow-frameworks/core-framework/pom.xml b/streamflow-frameworks/core-framework/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-frameworks</artifactId>
-        <version>0.10.1</version>
+        <version>0.11.0</version>
     </parent>
 
     <artifactId>core-framework</artifactId>
@@ -84,6 +84,12 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>streamflow</groupId>
+            <artifactId>framework-annotations</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <!-- Storm Core Library (Provided) -->
         <dependency>
             <groupId>org.apache.storm</groupId>

diff --git a/streamflow-frameworks/pom.xml b/streamflow-frameworks/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow</artifactId>
-        <version>0.10.1</version>
+        <version>0.11.0</version>
     </parent>
 
     <artifactId>streamflow-frameworks</artifactId>

diff --git a/streamflow-frameworks/twitter-framework/pom.xml b/streamflow-frameworks/twitter-framework/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-frameworks</artifactId>
-        <version>0.10.1</version>
+        <version>0.11.0</version>
     </parent>
 
     <artifactId>twitter-framework</artifactId>
@@ -84,6 +84,12 @@
     </build>
 
     <dependencies>
+
+        <dependency>
+            <groupId>streamflow</groupId>
+            <artifactId>framework-annotations</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <!-- Storm Core Library (Provided) -->
         <dependency>
@@ -138,10 +144,5 @@
             <artifactId>twitter4j-stream</artifactId>
             <version>4.0.1</version>
         </dependency>
-        <dependency>
-        	<groupId>streamflow</groupId>
-        	<artifactId>framework-annotations</artifactId>
-        	<version>0.9.1</version>
-        </dependency>
     </dependencies>
 </project>