diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-12-04 21:09:28 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-12-04 21:09:28 +0000 |
| commit | bc1c8ab4c48c3a81824dac27ba71a8d1277797b9 (patch) | |
| tree | 23c988da3cf03f70f49413ed753a439e5e6f0f80 /java/sca/itest/osgi-tuscany | |
| parent | 84f0a5f2ace3b19ff61928d32ab5674ff0daf462 (diff) | |
Merge itest changes from sca-equinox branch into trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723439 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/itest/osgi-tuscany')
| -rw-r--r-- | java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml | 9 | ||||
| -rw-r--r-- | java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml index 1b763f205a..84f8cc015b 100644 --- a/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml +++ b/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml @@ -35,11 +35,6 @@ <dependencies> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-monitor-logging</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> <artifactId>tuscany-assembly</artifactId> <version>${pom.version}</version> </dependency> @@ -445,7 +440,7 @@ <exclusions> <exclusion> <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-host-tomcat</artifactId> + <artifactId>tuscany-host-jetty</artifactId> </exclusion> </exclusions> </dependency> @@ -537,7 +532,7 @@ <exclusions> <exclusion> <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-host-tomcat</artifactId> + <artifactId>tuscany-host-jetty</artifactId> </exclusion> </exclusions> </dependency> diff --git a/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml index f08acaa994..5804f4711d 100644 --- a/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml +++ b/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml @@ -36,11 +36,6 @@ <dependencies> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-monitor-logging</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> <artifactId>tuscany-assembly</artifactId> <version>${pom.version}</version> </dependency> @@ -446,7 +441,7 @@ <exclusions> <exclusion> <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-host-tomcat</artifactId> + <artifactId>tuscany-host-jetty</artifactId> </exclusion> </exclusions> </dependency> @@ -538,7 +533,7 @@ <exclusions> <exclusion> <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-host-tomcat</artifactId> + <artifactId>tuscany-host-jetty</artifactId> </exclusion> </exclusions> </dependency> |