From 9c36dc55ed5b13d722a6a2fd5c8ed1d97835be8a Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 19 May 2010 21:02:45 +0000
Subject: [PATCH] Merge revision r944733 from release branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946394 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-java-1.x/trunk/tutorials/travelsample/pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/pom.xml
index 9ca2cceebe..1ab75d0064 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/pom.xml
@@ -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>