You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2011/08/09 13:33:31 UTC
svn commit: r1155315 - in /servicemix/documentation/trunk: pom.xml
src/test/scala/org/apache/servicemix/documentation/HelperTest.scala
Author: gertv
Date: Tue Aug 9 11:33:31 2011
New Revision: 1155315
URL: http://svn.apache.org/viewvc?rev=1155315&view=rev
Log:
Upgrade to Scalate 1.5.0 and Scala 2.9.0
Modified:
servicemix/documentation/trunk/pom.xml
servicemix/documentation/trunk/src/test/scala/org/apache/servicemix/documentation/HelperTest.scala
Modified: servicemix/documentation/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/pom.xml?rev=1155315&r1=1155314&r2=1155315&view=diff
==============================================================================
--- servicemix/documentation/trunk/pom.xml (original)
+++ servicemix/documentation/trunk/pom.xml Tue Aug 9 11:33:31 2011
@@ -44,9 +44,9 @@
<pdf.required>false</pdf.required>
- <scala.version>2.8.1</scala.version>
+ <scala.version>2.9.0</scala.version>
- <scalate.version>1.4.0</scalate.version>
+ <scalate.version>1.5.0</scalate.version>
<scalate.mode>production</scalate.mode>
<scalate.workdir>${basedir}/target/scalateWorkDir</scalate.workdir>
@@ -377,7 +377,7 @@
</goals>
<phase>prepare-package</phase>
<configuration>
- <warSourceDirectory>${webapp.dir}</warSourceDirectory>
+ <webappDirectory>${webapp.dir}</webappDirectory>
</configuration>
</execution>
</executions>
Modified: servicemix/documentation/trunk/src/test/scala/org/apache/servicemix/documentation/HelperTest.scala
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/test/scala/org/apache/servicemix/documentation/HelperTest.scala?rev=1155315&r1=1155314&r2=1155315&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/test/scala/org/apache/servicemix/documentation/HelperTest.scala (original)
+++ servicemix/documentation/trunk/src/test/scala/org/apache/servicemix/documentation/HelperTest.scala Tue Aug 9 11:33:31 2011
@@ -40,7 +40,7 @@ class HelperTest {
@Test
def testSitegen = {
assertTrue("DummyTemplateEngine is used in scalate:sitegen",
- sitegen(new DummyTemplateEngine(Array[File]())))
+ sitegen(new DummyTemplateEngine(null)))
assertFalse("Any other template engine means we're not in scalate:sitegen",
sitegen(new TemplateEngine()))