diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-26 23:44:59 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-26 23:44:59 +0000 |
| commit | 71a7cba384b8ae7f4578fb9ab1f725d5ce616074 (patch) | |
| tree | 98bbc7c066d037a8d9ea1fea7a3ccfa64419ab11 /branches/sca-java-1.x/distribution/bundle | |
| parent | 01a38d872dc2692d2a31f07f9c8f8098aa078853 (diff) | |
Merge all changes from 1.5.2 branch into trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830026 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | branches/sca-java-1.x/distribution/bundle/pom.xml | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/branches/sca-java-1.x/distribution/bundle/pom.xml b/branches/sca-java-1.x/distribution/bundle/pom.xml index 4192216436..0292aad046 100644 --- a/branches/sca-java-1.x/distribution/bundle/pom.xml +++ b/branches/sca-java-1.x/distribution/bundle/pom.xml @@ -52,6 +52,11 @@ <artifactId>tuscany-binding-atom-js</artifactId> <version>${pom.version}</version> </dependency> + <!--dependency> + <groupId>${pom.groupId}</groupId> + <artifactId>tuscany-binding-atom-js-dojo</artifactId> + <version>${pom.version}</version> + </dependency--> <dependency> <groupId>${pom.groupId}</groupId> <artifactId>tuscany-binding-atom-abdera</artifactId> @@ -107,6 +112,11 @@ <artifactId>tuscany-binding-jsonrpc-js</artifactId> <version>${pom.version}</version> </dependency> + <!--dependency> + <groupId>${pom.groupId}</groupId> + <artifactId>tuscany-binding-jsonrpc-js-dojo</artifactId> + <version>${pom.version}</version> + </dependency--> <dependency> <groupId>${pom.groupId}</groupId> <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> @@ -449,6 +459,11 @@ <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId> <version>${pom.version}</version> </dependency> + <!--dependency> + <groupId>${pom.groupId}</groupId> + <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId> + <version>${pom.version}</version> + </dependency--> <dependency> <groupId>${pom.groupId}</groupId> <artifactId>tuscany-node-api</artifactId> @@ -520,6 +535,11 @@ <artifactId>tuscany-web-javascript</artifactId> <version>${pom.version}</version> </dependency> + <!--dependency> + <groupId>${pom.groupId}</groupId> + <artifactId>tuscany-web-javascript-dojo</artifactId> + <version>${pom.version}</version> + </dependency--> <dependency> <groupId>${pom.groupId}</groupId> <artifactId>tuscany-workspace</artifactId> @@ -550,17 +570,13 @@ <artifactId>tuscany-wsdl2java</artifactId> <version>${pom.version}</version> <exclusions> - <exclusion> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-activation_1.1_spec</artifactId> </exclusion> - </exclusions> </dependency> - - <dependency> + <dependency> <groupId>org.apache.tuscany.sdo</groupId> <artifactId>tuscany-sdo-impl</artifactId> <version>1.1.1</version> @@ -577,13 +593,11 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>org.apache.tuscany.sdo</groupId> <artifactId>tuscany-sdo-tools</artifactId> <version>1.1.1</version> </dependency> - </dependencies> <build> |