From b254ec3d727e21c801e490c7a9d8a51cd038dd7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Krzewski?= <rafal.krzewski@caltha.pl>
Date: Mon, 10 Sep 2012 01:50:39 +0200
Subject: [PATCH 1/5] Use scala 2.10.0-M7

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e63bd33b..fe1b4ab6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
     <forge-project-id>scalamd</forge-project-id>
     <release-altGitURL>scm:git:ssh://git@github.com:chirino/scalamd.git</release-altGitURL>
     
-    <scala-version>2.8.1</scala-version>
+    <scala-version>2.10.0-M7</scala-version>
     <maven-scala-plugin-version>2.15.0</maven-scala-plugin-version>
     <maven-surefire-plugin-version>2.4.3</maven-surefire-plugin-version>
     <bundle-plugin-version>2.3.4</bundle-plugin-version>

From 3ae7c3e7eda14aeb8d010f267d66864d07f68cd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Krzewski?= <rafal.krzewski@caltha.pl>
Date: Mon, 10 Sep 2012 01:52:14 +0200
Subject: [PATCH 2/5] Use net.alchim31.maven:scala-maven-plugin which is now
 the actively developed version.

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index fe1b4ab6..9d279144 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
     <release-altGitURL>scm:git:ssh://git@github.com:chirino/scalamd.git</release-altGitURL>
     
     <scala-version>2.10.0-M7</scala-version>
-    <maven-scala-plugin-version>2.15.0</maven-scala-plugin-version>
+    <scala-maven-plugin-version>3.1.0</scala-maven-plugin-version>
     <maven-surefire-plugin-version>2.4.3</maven-surefire-plugin-version>
     <bundle-plugin-version>2.3.4</bundle-plugin-version>
     
@@ -126,9 +126,9 @@
 
     <plugins>
       <plugin>
-        <groupId>org.scala-tools</groupId>
-        <artifactId>maven-scala-plugin</artifactId>
-        <version>${maven-scala-plugin-version}</version>
+        <groupId>net.alchim31.maven</groupId>
+        <artifactId>scala-maven-plugin</artifactId>
+        <version>${scala-maven-plugin-version}</version>
         <executions>
           <execution>
             <goals>

From c26837dac6251897d36c1aef75393492cfc5e4b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Krzewski?= <rafal.krzewski@caltha.pl>
Date: Mon, 10 Sep 2012 01:53:53 +0200
Subject: [PATCH 3/5] Use specs2 as specs do not support Scala 2.10

---
 pom.xml                   |  6 +++---
 src/test/scala/test.scala | 22 ++++++++++------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9d279144..ef6d534a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,9 +80,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.scala-tools.testing</groupId>
-      <artifactId>specs_2.8.1</artifactId>
-      <version>1.6.6</version>
+      <groupId>org.specs2</groupId>
+      <artifactId>specs2_2.10.0-M7</artifactId>
+      <version>1.12.1.1</version>
       <scope>test</scope>
     </dependency>
     
diff --git a/src/test/scala/test.scala b/src/test/scala/test.scala
index 8668775b..398ad26a 100644
--- a/src/test/scala/test.scala
+++ b/src/test/scala/test.scala
@@ -3,20 +3,19 @@
  */
 package org.fusesource.scalamd.test
 
-import org.specs.runner.JUnit4
-import org.specs.Specification
 import java.io.File
 import org.fusesource.scalamd.Markdown
 import org.apache.commons.io.FileUtils
 import org.apache.commons.lang.StringUtils
-import org.specs.matcher.Matcher
+import org.specs2.mutable._
+import org.specs2.matcher.Expectable
+import org.specs2.matcher.Matcher
 
-class SpecsTest extends JUnit4(MarkdownSpec)
-
-object MarkdownSpec extends Specification {
+object MarkdownSpec extends SpecificationWithJUnit {
 
   val beFine = new Matcher[String] {
-    def apply(name: => String) = {
+    def apply[S <: String](s: Expectable[S]) = {
+      val name = s.value
       val textFile = new File(this.getClass.getResource("/" + name + ".text").toURI)
       val htmlFile = new File(this.getClass.getResource("/" + name + ".html").toURI)
       val text = Markdown(FileUtils.readFileToString(textFile, "UTF-8")).trim
@@ -24,15 +23,14 @@ object MarkdownSpec extends Specification {
       val html = FileUtils.readFileToString(htmlFile, "UTF-8").trim
       val diffIndex = StringUtils.indexOfDifference(text, html)
       val diff = StringUtils.difference(text, html)
-      (diffIndex == -1,
+      result(diffIndex == -1,
           "\"" + name + "\" is fine",
-          "\"" + name + "\" fails at " + diffIndex + ": " + StringUtils.abbreviate(diff, 32))
+          "\"" + name + "\" fails at " + diffIndex + ": " + StringUtils.abbreviate(diff, 32),
+          s)
     }
   }
 
-  def process = addToSusVerb("process")
-
-  "MarkdownProcessor" should process {
+  "MarkdownProcessor" should {
     "Images" in {
       "Images" must beFine
     }

From 6d4b4cb367fb9ef48694cddca96385858523091c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Krzewski?= <rafal.krzewski@caltha.pl>
Date: Mon, 10 Sep 2012 01:55:26 +0200
Subject: [PATCH 4/5] Use dedicated specs2 plugin to run the tests instead of
 surefire. 0.3.1-SNAPSHOT version that works with Scala 2.10 can be found in
 my fork: https://github.com/rkrzewski/maven-specs2-plugin

---
 pom.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index ef6d534a..b5051412 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,18 +151,18 @@
       </plugin>
       
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${maven-surefire-plugin-version}</version>
-        
-        <configuration>
-          <!-- we must turn off the use of system class loader so our tests can find stuff - otherwise ScalaSupport compiler can't find stuff -->
-          <useSystemClassLoader>false</useSystemClassLoader>
-          <!--forkMode>pertest</forkMode-->
-          <childDelegation>false</childDelegation>
-          <useFile>true</useFile>
-          <failIfNoTests>false</failIfNoTests>
-        </configuration>
+        <groupId>com.mmakowski</groupId>
+        <artifactId>maven-specs2-plugin</artifactId>
+        <version>0.3.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>test-specs2</id>
+            <phase>test</phase>
+            <goals>
+              <goal>run-specs</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
 
       <plugin>

From 03ded3473e657bbe90e105b028b996ad79f4c523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Krzewski?= <rafal.krzewski@caltha.pl>
Date: Wed, 19 Sep 2012 22:36:40 +0200
Subject: [PATCH 5/5] Use newly released version of maven-specs2-plugin

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b5051412..9c0f24f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,7 @@
       <plugin>
         <groupId>com.mmakowski</groupId>
         <artifactId>maven-specs2-plugin</artifactId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.4.0-RC1</version>
         <executions>
           <execution>
             <id>test-specs2</id>