Author: reto
Date: Thu Mar 4 09:38:15 2010
New Revision: 918911
URL: http://svn.apache.org/viewvc?rev=918911&view=rev
Log:
added missing dependency
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/FelixContextualMenuGeneratorTest.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/pom.xml?rev=918911&r1=918910&r2=918911&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/pom.xml
Thu Mar 4 09:38:15 2010
@@ -113,6 +113,16 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.utils</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
@@ -144,20 +154,19 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- <version>4.0.1</version>
- <scope>test</scope>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.scala</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-osgi</artifactId>
- <version>4.0</version>
- <scope>test</scope>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.scala</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>4.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/FelixContextualMenuGeneratorTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/FelixContextualMenuGeneratorTest.java?rev=918911&r1=918910&r2=918911&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/FelixContextualMenuGeneratorTest.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/FelixContextualMenuGeneratorTest.java
Thu Mar 4 09:38:15 2010
@@ -69,12 +69,13 @@
public static Option[] configuration() {
return options(
mavenConfiguration(),
+ //using old ds because of issues with 1.0.8
mavenBundle().groupId("org.apache.felix").artifactId(
- "org.apache.felix.scr").version("1.0.6"),
+ "org.apache.felix.scr").version("1.0.6"),
mavenBundle().groupId("org.apache.felix").artifactId(
"org.apache.felix.eventadmin").version("1.0.0"),
mavenBundle().groupId("org.apache.felix").artifactId(
- "org.apache.felix.metatype").version("1.0.2"),
+ "org.apache.felix.metatype").version("1.0.2"),
/*dsProfile(),*/
configProfile(),
webProfile(),