Merge revision r944733 from release branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946394 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
nash 2010-05-19 21:02:45 +00:00
commit 9c36dc55ed

View file

@ -19,18 +19,14 @@
-->
<project>
<modelVersion>4.0.0</modelVersion>
<properties>
<scatours.version>1.0-SNAPSHOT</scatours.version>
<tuscany.version>1.6</tuscany.version>
</properties>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
<version>${tuscany.version}</version>
<version>1.6</version>
</parent>
<artifactId>scatours</artifactId>
<packaging>pom</packaging>
<version>${scatours.version}</version>
<version>1.0-SNAPSHOT</version>
<name>Apache Tuscany SCA Tours Travel Sample</name>
<repositories>
@ -97,6 +93,10 @@
</profile>
</profiles>
<properties>
<tuscany.version>1.6</tuscany.version>
</properties>
<modules>
<module>util</module>
<module>contributions</module>