Merge branch 'feature-3.2.0-M1'

Author: bvenners

build.sbt

@@ -2,7 +2,7 @@ name := "testng-6.7"
 
 organization := "org.scalatestplus"
 
-version := "3.1.0.0-RC3"
+version := "3.1.0.0"
 
 homepage := Some(url("https://github.com/scalatest/scalatestplus-testng"))
 
@@ -23,14 +23,31 @@ developers := List(
   )
 )
 
-crossScalaVersions := List("2.10.7", "2.11.12", "2.12.10", "2.13.0")
+crossScalaVersions := List("2.10.7", "2.11.12", "2.12.10", "2.13.1")
 
 libraryDependencies ++= Seq(
-  "org.scalatest" %% "scalatest" % "3.1.0-RC3",
+  "org.scalatest" %% "scalatest" % "3.1.0",
   "org.testng" % "testng" % "6.7", 
-  "commons-io" % "commons-io" % "1.3.2" % "test"
+  "commons-io" % "commons-io" % "1.3.2" % "test", 
+  "org.scalatest" %% "scalatest-funsuite" % "3.2.0-M1" % "test"
 )
 
+import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
+import scala.xml.transform.{RewriteRule, RuleTransformer}
+
+// skip dependency elements with a scope
+pomPostProcess := { (node: XmlNode) =>
+  new RuleTransformer(new RewriteRule {
+    override def transform(node: XmlNode): XmlNodeSeq = node match {
+      case e: Elem if e.label == "dependency"
+          && e.child.exists(child => child.label == "scope") =>
+        def txt(label: String): String = "\"" + e.child.filter(_.label == label).flatMap(_.text).mkString + "\""
+        Comment(s""" scoped dependency ${txt("groupId")} % ${txt("artifactId")} % ${txt("version")} % ${txt("scope")} has been omitted """)
+      case _ => node
+    }
+  }).transform(node).head
+}
+
 testOptions in Test :=
   Seq(
     Tests.Argument(TestFrameworks.ScalaTest,

src/test/scala/org/scalatestplus/testng/TestNGSuiteGroupsSuite.scala

@@ -22,7 +22,7 @@ package org.scalatestplus.testng {
   import org.scalatestplus.testng.test._
 
   //execute(None, new StandardOutReporter, new Stopper {}, Filter(), ConfigMap.empty, None)
-  class TestNGSuiteGroupsSuite extends FunSuite {
+  class TestNGSuiteGroupsSuite extends funsuite.AnyFunSuite {
 
     //////////////////////////////////////////////////////////
     // TESTS FOR INCLUDE

src/test/scala/org/scalatestplus/testng/TestNGSuiteSuite.scala

@@ -22,7 +22,7 @@ import org.scalatest.fixture
 import org.hamcrest.core.IsAnything
 import org.scalatestplus.testng.SharedHelpers.EventRecordingReporter
 
-  class TestNGSuiteSuite extends FunSuite {
+  class TestNGSuiteSuite extends funsuite.AnyFunSuite {
 
     test("Reporter should be notified when test passes") {
 

src/test/scala/org/scalatestplus/testng/TestNGWrapperSuiteSuite.scala

@@ -21,7 +21,7 @@ import org.scalatestplus.testng.SharedHelpers.EventRecordingReporter
 
 package org.scalatestplus.testng {
 
-  class TestNGWrapperSuiteSuite extends FunSuite {
+  class TestNGWrapperSuiteSuite extends funsuite.AnyFunSuite {
 
     val XML_SUITES_PROPERTY = "xml_suites"