Skip to content

Commit

Permalink
Merge branch 'hotfix/0.10.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
juliencruz committed Apr 20, 2015
2 parents 41a5ee5 + dd00e63 commit 2355a48
Show file tree
Hide file tree
Showing 19 changed files with 33 additions and 31 deletions.
6 changes: 4 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>streamflow</groupId>
<artifactId>streamflow</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
<packaging>pom</packaging>

<name>StreamFlow</name>
Expand Down Expand Up @@ -65,7 +65,7 @@
<log4j.version>1.2.17</log4j.version>
<junit.version>4.11</junit.version>
<powermock.version>1.5.6</powermock.version>
<javassist.version>3.18.2-GA</javassist.version>
<javassist.version>3.18.2-GA</javassist.version>
</properties>

<modules>
Expand Down Expand Up @@ -590,6 +590,8 @@
<artifactId>jgitflow-maven-plugin</artifactId>
<version>1.0-m4.3</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<noDeploy>true</noDeploy>
</configuration>
</plugin>
</plugins>
Expand Down
18 changes: 9 additions & 9 deletions streamflow-annotations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
limitations under the License.
-->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow</artifactId>
<version>0.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow</artifactId>
<version>0.10.1</version>
</parent>

<artifactId>framework-annotations</artifactId>
<name>Streamflow Annotations</name>
<description>Annotations for use with Streamflow Frameworks</description>
<artifactId>framework-annotations</artifactId>
<name>Streamflow Annotations</name>
<description>Annotations for use with Streamflow Frameworks</description>

</project>
4 changes: 2 additions & 2 deletions streamflow-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>streamflow-core</artifactId>
Expand All @@ -38,4 +38,4 @@
<module>streamflow-server</module>
<module>streamflow-app</module>
</modules>
</project>
<version xmlns="">0.10.1</version></project>
2 changes: 1 addition & 1 deletion streamflow-core/streamflow-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow-core</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>streamflow-app</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamflow-core/streamflow-app/streamflow-app-jar/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow-app</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>streamflow-app-jar</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamflow-core/streamflow-app/streamflow-app-war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow-app</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>streamflow-app-war</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamflow-core/streamflow-datastore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow-core</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>streamflow-datastore</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow-datastore</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>streamflow-datastore-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow-datastore</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>streamflow-datastore-jdbc</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow-datastore</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>streamflow-datastore-mongodb</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamflow-core/streamflow-engine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow-core</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>streamflow-engine</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamflow-core/streamflow-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow-core</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>streamflow-model</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamflow-core/streamflow-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow-core</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>streamflow-server</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamflow-core/streamflow-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow-core</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>streamflow-service</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamflow-core/streamflow-util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow-core</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>streamflow-util</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions streamflow-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>streamflow-dist</artifactId>
Expand All @@ -33,13 +33,13 @@
<dependency>
<groupId>streamflow</groupId>
<artifactId>streamflow-app-jar</artifactId>
<version>${project.version}</version>
<version>0.10.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>streamflow</groupId>
<artifactId>streamflow-app-war</artifactId>
<version>${project.version}</version>
<version>0.10.1</version>
<type>war</type>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion streamflow-frameworks/core-framework/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow-frameworks</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>core-framework</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamflow-frameworks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>streamflow-frameworks</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion streamflow-frameworks/twitter-framework/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>streamflow</groupId>
<artifactId>streamflow-frameworks</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</parent>

<artifactId>twitter-framework</artifactId>
Expand Down

0 comments on commit 2355a48

Please sign in to comment.