Build: Test and evergreen updates

Update Integration test depedencies
Scala 2.11 cannot compile using Java 17
AWS ecs test requires jdk 17

JAVA-4388

Author: rozza

.evergreen/.evg.yml

@@ -1530,11 +1530,11 @@ axes:
       - id: "2.12"
         display_name: "Scala 2.12"
         variables:
-          SCALA: "2.12.10"
+          SCALA: "2.12.15"
       - id: "2.13"
         display_name: "Scala 2.13"
         variables:
-          SCALA: "2.13.0"
+          SCALA: "2.13.6"
 
   # Choice of MongoDB storage engine
   - id: storage-engine

.evergreen/javaConfig.bash

@@ -5,11 +5,11 @@ export JDK8="/opt/java/jdk8"
 export JDK11="/opt/java/jdk11"
 export JDK17="/opt/java/jdk17"
 
-if [ -d "$JDK11" ]; then
-  export JAVA_HOME=$JDK11
+if [ -d "$JDK17" ]; then
+  export JAVA_HOME=$JDK17
 fi
 
-export JAVA_VERSION=${JAVA_VERSION:-11}
+export JAVA_VERSION=${JAVA_VERSION:-17}
 
 echo "Java Configs:"
 echo "Java Home: ${JAVA_HOME}"

.evergreen/run-mongodb-aws-ecs-test.sh

@@ -25,7 +25,10 @@ apt update
 
 if ! which java ; then
     echo "Installing java..."
-    apt install openjdk-11-jdk -y
+    # Ubuntu 18.04 ca-certificates-java and opendjdk-17 bug work around
+    dpkg --purge --force-depends ca-certificates-java
+    apt install ca-certificates-java -y
+    apt install openjdk-17-jdk -y
 fi
 
 if ! which git ; then

.evergreen/run-scala-tests.sh

@@ -34,4 +34,4 @@ fi
 echo "Running scala tests with Scala $SCALA"
 
 ./gradlew -version
-./gradlew -PjavaVersion=${JAVA_VERSION} -PscalaVersion=$SCALA --stacktrace --info :bson-scala:test :driver-scala:test :driver-scala:integrationTest -Dorg.mongodb.test.uri=${MONGODB_URI} ${MULTI_MONGOS_URI_SYSTEM_PROPERTY}
+./gradlew -PscalaVersion=$SCALA --stacktrace --info :bson-scala:test :driver-scala:test :driver-scala:integrationTest -Dorg.mongodb.test.uri=${MONGODB_URI} ${MULTI_MONGOS_URI_SYSTEM_PROPERTY}

bson-scala/build.gradle

@@ -24,11 +24,10 @@ dependencies {
 sourceSets {
     main {
         scala {
-            srcDirs += ["src/main/scala"]
             if(scalaVersion.startsWith("2.13")) {
-                srcDirs += ["src/main/scala-2.13+"]
+                srcDirs = ["src/main/scala", "src/main/scala-2.13+"]
             } else {
-                srcDirs += ["src/main/scala-2.13-"]
+                srcDirs = ["src/main/scala", "src/main/scala-2.13-"]
             }
         }
     }

build.gradle

@@ -72,10 +72,6 @@ configure(coreProjects) {
         mavenLocal()
         google()
         mavenCentral()
-        maven {
-            url 'https://oss.sonatype.org/content/repositories/snapshots'
-        }
-
     }
 }
 
@@ -133,12 +129,6 @@ configure(scalaProjects) {
         scalaCompileOptions.deprecation = false
     }
 
-    if (project.scalaVersion.startsWith("2.13")) {
-        scaladoc {
-            scalaClasspath += files("$rootDir/gradle/scala/lib/scala-ant-2.13.1.jar")
-        }
-    }
-
     tasks.withType(GenerateModuleMetadata) {
         enabled = false
     }
@@ -336,7 +326,7 @@ def getGitVersion() {
     describeStdOut.toString().substring(1).trim()
 }
 
+apply from: 'gradle/javaToolchain.gradle'
 apply from: 'gradle/publish.gradle'
 apply from: 'gradle/deploy.gradle'
 apply from: 'gradle/javadoc.gradle'
-apply from: 'gradle/javaToolchain.gradle'

driver-scala/build.gradle

@@ -17,6 +17,13 @@
 description = "A Scala wrapper of the MongoDB Reactive Streams Java driver"
 archivesBaseName = 'mongo-scala-driver'
 
+configurations {
+    integrationTestImplementation {
+        extendsFrom testImplementation
+        canBeResolved = true
+    }
+}
+
 dependencies {
     implementation project(path: ':bson-scala', configuration: 'default')
     implementation project(path: ':driver-reactive-streams', configuration: 'default')
@@ -29,18 +36,12 @@ dependencies {
     testRuntimeOnly project(path: ':driver-core', configuration: 'consumableTestRuntimeOnly')
 }
 
-
-configurations {
-    integrationTestCompile.extendsFrom testImplementation
-    integrationTestRuntime.extendsFrom testRuntime
-}
-
 sourceSets {
     integrationTest {
         scala.srcDir file('src/it/scala')
         scala {
-            compileClasspath += main.output + test.output
-            runtimeClasspath += main.output + test.output
+            compileClasspath += main.output
+            runtimeClasspath += main.output
         }
     }
 }
@@ -76,18 +77,13 @@ task aggregatedScalaDoc(type: ScalaDoc) {
     source = fromProjects.collect { it.sourceSets.main.allSource }
 
     scalaDocOptions.additionalParameters = ["-doc-root-content", "${project.rootDir}/driver-scala/rootdoc.txt" as String]
-
-    // Workaround for gradle 2.13 scaladoc issue: https://github.com/gradle/gradle/issues/9855
-    if (project.scalaVersion.startsWith("2.13")) {
-        //scalaClasspath += files("$rootDir/gradle/scala/lib/scala-ant-2.13.1.jar")
-    }
 }
 
 idea {
     module {
         testSourceDirs += sourceSets.integrationTest.scala.srcDirs
         testResourceDirs += sourceSets.integrationTest.resources.srcDirs
-        scopes.TEST.plus += [ configurations.integrationTestCompile ]
+        scopes.TEST.plus += [ configurations.integrationTestImplementation ]
     }
 }
 

driver-scala/src/it/scala/org/mongodb/scala/gridfs/GridFSObservableSpec.scala

@@ -39,7 +39,7 @@ class GridFSObservableSpec extends RequiresMongoDBISpec with FuturesSpec with Be
   private var _filesCollection: Option[MongoCollection[GridFSFile]] = None
   private var _chunksCollection: Option[MongoCollection[Document]] = None
   private val singleChunkString = "GridFS"
-  private val multiChunkString = singleChunkString.formatted(s"%${1024 * 255 * 5}s")
+  private val multiChunkString = f"${singleChunkString}%1305600s"
 
   override def beforeEach(): Unit = {
     val mongoDatabase = mongoClient().getDatabase(databaseName)

driver-scala/src/test/scala/org/mongodb/scala/MongoDriverInformationSpec.scala

@@ -28,7 +28,7 @@ class MongoDriverInformationSpec extends BaseSpec {
       MongoDriverInformationClass.getDeclaredFields.filter(f => isStatic(f.getModifiers)).map(_.getName).toSet
     val wrappedMethods =
       MongoDriverInformationClass.getDeclaredMethods.filter(f => isStatic(f.getModifiers)).map(_.getName).toSet
-    val exclusions = Set("$VALUES", "valueOf", "values")
+    val exclusions = Set("$VALUES", "$values", "valueOf", "values")
 
     val wrapped = (wrappedFields ++ wrappedMethods) -- exclusions
     val local = MongoDriverInformation.getClass.getDeclaredMethods.map(_.getName).toSet -- Set(

driver-scala/src/test/scala/org/mongodb/scala/ReadConcernLevelSpec.scala

@@ -32,7 +32,7 @@ class ReadConcernLevelSpec extends BaseSpec {
       .filter(f => isStatic(f.getModifiers))
       .map(_.getName)
       .toSet
-    val exclusions = Set("$VALUES", "valueOf", "values")
+    val exclusions = Set("$VALUES", "$values", "valueOf", "values")
 
     val wrapped = (wrappedFields ++ wrappedMethods) -- exclusions
     val local = ReadConcernLevel.getClass.getDeclaredMethods.map(_.getName).toSet -- Set(