You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/07/24 10:07:01 UTC
svn commit: r978822 - in /tuscany/sca-java-2.x/branches/2.0-Beta1: ./
features/core/pom.xml modules/assembly-xml/pom.xml
samples/webapps/helloworld-bpel/pom.xml
Author: antelder
Date: Sat Jul 24 08:07:01 2010
New Revision: 978822
URL: http://svn.apache.org/viewvc?rev=978822&view=rev
Log:
Fix some snapshot -> beta1-snapshot versions which had conflicts during the merges
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta1/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/features/core/pom.xml
tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly-xml/pom.xml
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-bpel/pom.xml
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 24 08:07:01 2010
@@ -1 +1 @@
-/tuscany/sca-java-2.x/trunk:966568,966629,966650-966658,966703,966706,966708,966714,966983,967035,967037,967100-967101
+/tuscany/sca-java-2.x/trunk:966568,966629,966650-966658,966703,966706,966708,966714,966983,967035,967037,967047,967100-967101
Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/features/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/features/core/pom.xml?rev=978822&r1=978821&r2=978822&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/features/core/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/features/core/pom.xml Sat Jul 24 08:07:01 2010
@@ -234,7 +234,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-shell</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-Beta1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly-xml/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly-xml/pom.xml?rev=978822&r1=978821&r2=978822&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly-xml/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/modules/assembly-xml/pom.xml Sat Jul 24 08:07:01 2010
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-common-xml</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-Beta1-SNAPSHOT</version>
</dependency>
<!--
Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-bpel/pom.xml?rev=978822&r1=978821&r2=978822&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-bpel/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/webapps/helloworld-bpel/pom.xml Sat Jul 24 08:07:01 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-Beta1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>