Author: nash
Date: Tue Aug 24 20:04:53 2010
New Revision: 988697
URL: http://svn.apache.org/viewvc?rev=988697&view=rev
Log:
Merge revision 945607 from trunk into the 1.6.1 branch
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml?rev=988697&r1=988696&r2=988697&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
(original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
Tue Aug 24 20:04:53 2010
@@ -484,6 +484,16 @@
</dependency-->
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-web</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-web-runtime</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-node-api</artifactId>
<version>${pom.version}</version>
</dependency>
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml?rev=988697&r1=988696&r2=988697&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml
(original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml
Tue Aug 24 20:04:53 2010
@@ -537,6 +537,16 @@
</dependency-->
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-web</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-web-runtime</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-node-api</artifactId>
<version>${pom.version}</version>
</dependency>
