You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2022/10/10 09:25:14 UTC
[tomee] 02/02: Update and fix scala test so it builds under JDK17
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 32622ad5463ab64722fb489a7e3acd2d94b3b3bf
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Mon Oct 10 11:25:03 2022 +0200
Update and fix scala test so it builds under JDK17
---
examples/scala-basic/build.sbt | 8 ++++----
examples/scala-basic/pom.xml | 4 ++--
.../src/test/scala/org/superbiz/GreetingServiceTest.scala | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/examples/scala-basic/build.sbt b/examples/scala-basic/build.sbt
index 799f8590d5..604b868c8c 100644
--- a/examples/scala-basic/build.sbt
+++ b/examples/scala-basic/build.sbt
@@ -19,7 +19,7 @@ name := "scala-basic"
version := "1.1.0-SNAPSHOT"
-scalaVersion := "2.11.1"
+scalaVersion := "2.13.9"
resolvers ++= Seq(
"Local Maven Repository" at "file://" + Path.userHome.absolutePath + "/.m2/repository",
@@ -27,8 +27,8 @@ resolvers ++= Seq(
)
libraryDependencies ++= Seq(
- "org.apache.openejb" % "jakartaee-api" % "9.0-M2",
- "org.apache.openejb" % "openejb-core" % "9.0.0-M2-SNAPSHOT" % "test",
- "org.scalatest" %% "scalatest_2.11" % "2.2.0" % "test"
+ "org.apache.openejb" % "jakartaee-api" % "9.1-M2",
+ "org.apache.openejb" % "openejb-core" % "9.0.0-M9-SNAPSHOT" % "test",
+ "org.scalatest" %% "scalatest_2.13" % "3.2.14" % "test"
)
diff --git a/examples/scala-basic/pom.xml b/examples/scala-basic/pom.xml
index 98da39ef03..532347d003 100644
--- a/examples/scala-basic/pom.xml
+++ b/examples/scala-basic/pom.xml
@@ -26,7 +26,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<scala.version>2.13</scala.version>
- <scala.full-version>${scala.version}.0</scala.full-version>
+ <scala.full-version>${scala.version}.9</scala.full-version>
</properties>
<repositories>
<repository>
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.version}</artifactId>
- <version>3.0.8</version>
+ <version>3.2.14</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/examples/scala-basic/src/test/scala/org/superbiz/GreetingServiceTest.scala b/examples/scala-basic/src/test/scala/org/superbiz/GreetingServiceTest.scala
index 3d6833e990..21452c5a18 100644
--- a/examples/scala-basic/src/test/scala/org/superbiz/GreetingServiceTest.scala
+++ b/examples/scala-basic/src/test/scala/org/superbiz/GreetingServiceTest.scala
@@ -18,10 +18,10 @@ package org.superbiz
import jakarta.ejb.embeddable.EJBContainer
import jakarta.inject.Inject
+import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
+import org.scalatest.funsuite.AnyFunSuite
-import org.scalatest._
-
-class GreetingServiceTest extends FunSuite with BeforeAndAfterAll with BeforeAndAfterEach {
+class GreetingServiceTest extends AnyFunSuite with BeforeAndAfterAll with BeforeAndAfterEach {
@Inject
private var service: GreetingService = null