You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/11/04 14:14:55 UTC
logging-log4j2 git commit: Upgrade to Scalatest 3.0.0
Repository: logging-log4j2
Updated Branches:
refs/heads/master 7090c2f78 -> 38dd9f2d6
Upgrade to Scalatest 3.0.0
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/38dd9f2d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/38dd9f2d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/38dd9f2d
Branch: refs/heads/master
Commit: 38dd9f2d6fb7c10d8732b88fb4e91b0b048d18c4
Parents: 7090c2f
Author: Mikael St�ldal <mi...@magine.com>
Authored: Fri Nov 4 15:14:46 2016 +0100
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Fri Nov 4 15:14:46 2016 +0100
----------------------------------------------------------------------
log4j-api-scala_2.10/pom.xml | 2 +-
.../src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala | 2 +-
log4j-api-scala_2.11/pom.xml | 2 +-
.../src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/38dd9f2d/log4j-api-scala_2.10/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.10/pom.xml b/log4j-api-scala_2.10/pom.xml
index 46edf74..b683d78 100644
--- a/log4j-api-scala_2.10/pom.xml
+++ b/log4j-api-scala_2.10/pom.xml
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.10</artifactId>
- <version>2.2.6</version>
+ <version>3.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/38dd9f2d/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala b/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
index 91d67df..3df2c1f 100644
--- a/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
+++ b/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
@@ -23,7 +23,7 @@ import org.junit.runner.RunWith
import org.mockito.Matchers.{any, anyString, eq => eqv}
import org.mockito.Mockito._
import org.scalatest.junit.JUnitRunner
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
import org.scalatest.{FunSuite, Matchers}
case class Custom(i: Int)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/38dd9f2d/log4j-api-scala_2.11/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.11/pom.xml b/log4j-api-scala_2.11/pom.xml
index 4a7ba19..fd68287 100644
--- a/log4j-api-scala_2.11/pom.xml
+++ b/log4j-api-scala_2.11/pom.xml
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.11</artifactId>
- <version>2.2.6</version>
+ <version>3.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/38dd9f2d/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala b/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
index 91d67df..3df2c1f 100644
--- a/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
+++ b/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
@@ -23,7 +23,7 @@ import org.junit.runner.RunWith
import org.mockito.Matchers.{any, anyString, eq => eqv}
import org.mockito.Mockito._
import org.scalatest.junit.JUnitRunner
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
import org.scalatest.{FunSuite, Matchers}
case class Custom(i: Int)