Author: davsclaus
Date: Sat Sep 19 06:35:25 2009
New Revision: 816860
URL: http://svn.apache.org/viewvc?rev=816860&view=rev
Log:
Working with maven 2.0.9 again.
Modified:
camel/trunk/examples/camel-example-reportincident/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/tests/camel-itest-osgi/pom.xml
camel/trunk/tests/test-bundles/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=816860&r1=816859&r2=816860&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident/pom.xml (original)
+++ camel/trunk/examples/camel-example-reportincident/pom.xml Sat Sep 19
06:35:25 2009
@@ -98,12 +98,11 @@
</dependency>
<!-- 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.tests</groupId>
+
<artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=816860&r1=816859&r2=816860&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sat Sep 19 06:35:25 2009
@@ -508,12 +508,11 @@
<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=816860&r1=816859&r2=816860&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Sat Sep 19 06:35:25 2009
@@ -104,12 +104,11 @@
<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>
Modified: camel/trunk/tests/test-bundles/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/test-bundles/pom.xml?rev=816860&r1=816859&r2=816860&view=diff
==============================================================================
--- camel/trunk/tests/test-bundles/pom.xml (original)
+++ camel/trunk/tests/test-bundles/pom.xml Sat Sep 19 06:35:25 2009
@@ -143,6 +143,8 @@
</build>
<modules>
+<!-- TODO: Does not work with maven 2.0.9
<module>mock-javamail_1.7</module>
+-->
</modules>
</project>
