summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/2.0-Beta1
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2010-10-27 11:20:15 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2010-10-27 11:20:15 +0000
commite0aa44676ee9f60d3c66170dd23f219fc2d45788 (patch)
tree1a5f75e849c9dc9a86f52703b93a13d97e92fea7 /sca-java-2.x/branches/2.0-Beta1
parenta7e048e4b23e7c6f0aee05d86da197df2c6f4cc8 (diff)
Tidy up dependencies
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027915 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/branches/2.0-Beta1')
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml34
1 files changed, 21 insertions, 13 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml
index fac4b8c286..fe65a86bdd 100644
--- a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-samples</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>sample-maven-osgi-junit-calculator-rest-osgi</artifactId>
@@ -31,29 +31,37 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-api</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
+ <artifactId>tuscany-core-runtime-pom</artifactId>
+ <version>2.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-osgi-runtime-pom</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-rest-runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-all</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
+ <artifactId>tuscany-base-runtime-pom</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-rest-runtime</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<!-- Explicitly add slf4j so that jabsorb uses the latest versions -->
@@ -67,7 +75,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>