Author: ningjiang
Date: Tue Sep 7 03:05:50 2010
New Revision: 993202
URL: http://svn.apache.org/viewvc?rev=993202&view=rev
Log:
Downgraded the scala-plugin-version to 2.13.1 to make apache hudson happy
Modified:
camel/trunk/parent/pom.xml
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=993202&r1=993201&r2=993202&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Sep 7 03:05:50 2010
@@ -115,7 +115,7 @@
<rome-version>1.0</rome-version>
<saxon-version>9.1.0.8</saxon-version>
<scala-version>2.8.0</scala-version>
- <scala-plugin-version>2.14.1</scala-plugin-version>
+ <scala-plugin-version>2.13.1</scala-plugin-version>
<shiro-version>1.0.0-incubating</shiro-version>
<slf4j-version>1.6.1</slf4j-version>
<smack-version>3.1.0</smack-version>
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java?rev=993202&r1=993201&r2=993202&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
Tue Sep 7 03:05:50 2010
@@ -135,7 +135,8 @@ public class MailRouteTest extends OSGiI
mavenBundle().groupId("org.apache.camel").artifactId("camel-mail").versionAsInProject(),
// Added the mock_java_mail bundle for testing
-
mavenBundle().groupId("org.apache.camel.tests").artifactId("org.apache.camel.tests.mock-javamail_1.7").versionAsInProject(),
+ // just using the mock_java_mail version for testing
+
mavenBundle().groupId("org.apache.camel.tests").artifactId("org.apache.camel.tests.mock-javamail_1.7").version("2.4.0"),
workingDirectory("target/paxrunner/"),