summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-08-24 20:04:53 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-08-24 20:04:53 +0000
commita33179c2c8bdb58f66c42be885fddff8b423005e (patch)
treebf2c62b1552b9ec40f31b8aa07159c197635d106
parent459b531be4161735df56deb06a97d3d21f2b217a (diff)
Merge revision 945607 from trunk into the 1.6.1 branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@988697 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml10
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml10
2 files changed, 20 insertions, 0 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
index c18e95ee2f..59e97518ab 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
@@ -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>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml
index 70aaaf5062..36532f64b8 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml
@@ -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>