Hi Claus
Since Servicemix is plan to use the features file in Camel, we need to
run the OSGi tests to make sure the features file is working.
Maybe we can move the OSGi tests to other place to avoid these kind of
build error.
Willem
[email protected] wrote:
Author: davsclaus
Date: Fri Sep 18 15:13:56 2009
New Revision: 816665
URL: http://svn.apache.org/viewvc?rev=816665&view=rev
Log:
Removed mockmail-1.7 that causes maven 2.0.9 not being able to assemble a
release.
Removed:
camel/trunk/examples/camel-example-reportincident/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesOSGiTest.java
Modified:
camel/trunk/examples/camel-example-reportincident/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/tests/camel-itest-osgi/pom.xml
Modified: camel/trunk/examples/camel-example-reportincident/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident/pom.xml?rev=816665&r1=816664&r2=816665&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident/pom.xml (original)
+++ camel/trunk/examples/camel-example-reportincident/pom.xml Fri Sep 18
15:13:56 2009
@@ -32,19 +32,6 @@
</description>
<packaging>war</packaging>
- <repositories>
- <repository>
- <id>biz.aQute</id>
- <url>http://www.aqute.biz/repo</url>
- </repository>
- </repositories>
-
- <properties>
- <pax-exam-version>1.0.0</pax-exam-version>
- <pax-tiny-bundle-version>1.0.0</pax-tiny-bundle-version>
- </properties>
-
-
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -109,49 +96,15 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-default</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit-extender-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.swissbox</groupId>
- <artifactId>pax-swissbox-tinybundles</artifactId>
- <scope>test</scope>
+
+ <!-- unit testing mail using mock -->
+ <dependency>
+ <groupId>org.jvnet.mock-javamail</groupId>
+ <artifactId>mock-javamail</artifactId>
+ <version>1.7</version>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel.karaf</groupId>
- <artifactId>features</artifactId>
- <version>${version}</version>
- <type>pom</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-osgi</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.tests</groupId>
-
<artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId>
- <scope>test</scope>
- </dependency>
+
</dependencies>
<build>
@@ -219,16 +172,6 @@
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- TODO: temporary disable unit test to
let TC not hang -->
- <exclude>**/*OSGiTest.*</exclude>
- </excludes>
- </configuration>
- </plugin>
-
</plugins>
</build>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=816665&r1=816664&r2=816665&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Sep 18 15:13:56 2009
@@ -508,11 +508,12 @@
<version>${project.version}</version>
</dependency>
+ <!-- this one fails on maven 2.0.9 when assembling
<dependency>
<groupId>org.apache.camel.tests</groupId>
<artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency> -->
<!-- testing jars -->
<dependency>
Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=816665&r1=816664&r2=816665&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Fri Sep 18 15:13:56 2009
@@ -104,11 +104,12 @@
<artifactId>camel-jpa</artifactId>
<scope>test</scope>
</dependency>
+<!-- this one fails on maven 2.0.9
<dependency>
<groupId>org.apache.camel.tests</groupId>
<artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
