Modified: camel/trunk/components/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=881198&r1=881197&r2=881198&view=diff ============================================================================== --- camel/trunk/components/pom.xml (original) +++ camel/trunk/components/pom.xml Tue Nov 17 08:47:08 2009 @@ -80,8 +80,7 @@ <module>camel-ruby</module> <module>camel-rss</module> <module>camel-saxon</module> - <!--module>camel-scala</module>--> - <!-- TODO: Cannot compile due internal error --> + <module>camel-scala</module> <module>camel-script</module> <module>camel-servlet</module> <module>camel-snmp</module>
Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=881198&r1=881197&r2=881198&view=diff ============================================================================== --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Tue Nov 17 08:47:08 2009 @@ -76,7 +76,8 @@ <hsqldb-version>1.8.0.7</hsqldb-version> <groovy-version>1.6.3</groovy-version> <guiceyfruit-version>2.0</guiceyfruit-version> - <junit-version>4.6</junit-version> + <!-- spring 2.5.x is only compatible with junit 4.4 or lower - see SPR-5145 --> + <junit-version>4.4</junit-version> <ognl-version>2.7.3_1</ognl-version> <pax-exam-version>1.0.0</pax-exam-version> <pax-tiny-bundle-version>1.0.0</pax-tiny-bundle-version>
