summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x
diff options
context:
space:
mode:
authoredwardsmj <edwardsmj@13f79535-47bb-0310-9956-ffa450edef68>2011-02-03 13:26:15 +0000
committeredwardsmj <edwardsmj@13f79535-47bb-0310-9956-ffa450edef68>2011-02-03 13:26:15 +0000
commit0ce8cd39be7da08c098c306c884e7d111be76945 (patch)
tree4ff663110816b56d136c616aa861ddea36ab7322 /sca-java-2.x
parentf71c996bf90cb4e84ab01d98da5a3da5be8e72ac (diff)
Fix Eclipse module transitive dependencies with POM updates
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1066810 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x')
-rw-r--r--sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml68
1 files changed, 38 insertions, 30 deletions
diff --git a/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml b/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
index de19177f81..f6121829e3 100644
--- a/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
+++ b/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
@@ -44,28 +44,6 @@
<scope>compile</scope>
</dependency>
-<!--
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- <version>3.3.100-v20070530</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
- <version>1.2.0-v20090520-1800</version>
- <scope>runtime</scope>
- </dependency>
--->
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-base-runtime-pom</artifactId>
@@ -87,13 +65,11 @@
<scope>test</scope>
</dependency>
- <!-- dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-http-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency-->
-
+<!--
+* 03/02/2011 - It is hard to understand the complex web of dependencies related to the eclipse packages
+* that contain the OSGi implementation - however, this is what it takes to ensure that the dependencies
+* are satisfied.
+-->
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>runtime</artifactId>
@@ -103,7 +79,7 @@
<exclusion>
<groupId>org.eclipse.core</groupId>
<artifactId>contenttype</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>org.eclipse.equinox</groupId>
<artifactId>registry</artifactId>
@@ -138,8 +114,40 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>registry</artifactId>
+ <version>3.4.100-v20090520-1800</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>jobs</artifactId>
+ <version>3.4.0-v20080512</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
+ <version>3.5.0-v20090520-1800</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>app</artifactId>
+ <version>1.2.0-v20090520-1800</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>preferences</artifactId>
+ <version>3.2.300-v20090520-1800</version>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
+
<repositories>
<!-- Tuscany repository to hold artifacts that are not published in the public maven repos -->
<repository>