Author: antelder
Date: Thu Jun 3 10:46:09 2010
New Revision: 950946
URL: http://svn.apache.org/viewvc?rev=950946&view=rev
Log:
Merge 950940 from branch to trunk
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml
(contents, props changed)
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml?rev=950946&r1=950945&r2=950946&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml Thu
Jun 3 10:46:09 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>itest-nodes-one-jvm-hazelcast-client</artifactId>
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-rmi-runtime</artifactId>
+ <artifactId>tuscany-binding-hazelcast-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -66,22 +66,5 @@
</dependency>
</dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- <reportFormat>brief</reportFormat>
- <useFile>false</useFile>
- <forkMode>once</forkMode>
- <argLine>-ea -Xmx256m</argLine>
- <parallel>off</parallel>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Propchange:
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jun 3 10:46:09 2010
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-equinox/itest/nodes/one-jvm-hazelcast-client/pom.xml:694816-709480
+/tuscany/branches/sca-java-1.3/itest/nodes/one-jvm-hazelcast-client/pom.xml:671193,680620-680628
+/tuscany/sca-java-2.x/branches/sca-java-2.0-M5/itest/nodes/one-jvm-hazelcast-client/pom.xml:950940
