summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/2.0-Beta3
diff options
context:
space:
mode:
authorfmoga <fmoga@13f79535-47bb-0310-9956-ffa450edef68>2011-07-18 15:17:49 +0000
committerfmoga <fmoga@13f79535-47bb-0310-9956-ffa450edef68>2011-07-18 15:17:49 +0000
commitdd3bbfc71e0e032267755f5930c1cbb5b0a35d08 (patch)
treef8c61b6eccdb37fd4f87e3ff2e78047e7d9a5815 /sca-java-2.x/branches/2.0-Beta3
parentf7dceb93842d3e7c215f6e092a82c0f8a520113b (diff)
Fix merge problem
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1147926 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/branches/2.0-Beta3')
-rw-r--r--sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/pom.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/pom.xml b/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/pom.xml
index 4d47e9a8cd..1c605dc183 100644
--- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-modules</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-Beta3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -36,7 +36,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-base-runtime-pom</artifactId>
<type>pom</type>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-Beta3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>