[!456] - Remove scala 2.11 vanilla build

# New features and improvements

One less scala 2.11 build, faster CI pipeline.

# Breaking changes

None.

# Migration

None.

# Bug fixes

None.

# How this feature was tested

CI/CD pipelines

# Related issue

Closes #571

Author: agilelab-tmnd1991

.gitlab-ci.yml

@@ -21,16 +21,16 @@ cache:
     - "sbt-cache/target"
     - "sbt-cache/coursier"
     - node_modules/
-    - public/
-    # Node modules and dependencies
+    - public/ 
+      # Node modules and dependencies
 
 test-kernel:
   stage: test
   interruptible: true
   image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-8u432-b06-jdk-jammy"
   parallel:
     matrix:
-      - WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "CDP719", "EMR_6_13" ]
+      - WASP_FLAVOR: [ "VANILLA2_2_12", "CDP719", "EMR_6_13"]
   script:
     - ./run-sbt-unprivileged.sh "clean coverage wasp-kernel/test wasp-kernel/coverageAggregate"
   after_script:
@@ -49,15 +49,15 @@ test-kernel:
     - /^develop$/
     - /(^release\/v([0-9]+)\.([0-9]+))/
     - merge_requests
-  needs: [ ]
+  needs: []
 
 test-plugin:
   stage: test
   interruptible: true
   image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-8u432-b06-jdk-jammy"
   parallel:
     matrix:
-      - WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "CDP719", "EMR_6_13" ]
+      - WASP_FLAVOR: [ "VANILLA2_2_12", "CDP719", "EMR_6_13"]
   script:
     - ./run-sbt-unprivileged.sh "clean coverage wasp-plugin/test wasp-plugin/coverageAggregate"
   after_script:
@@ -77,15 +77,15 @@ test-plugin:
     - /^develop$/
     - /(^release\/v([0-9]+)\.([0-9]+))/
     - merge_requests
-  needs: [ ]
+  needs: []
 
 test-repo:
   stage: test
   interruptible: true
   image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-8u432-b06-jdk-jammy"
   parallel:
     matrix:
-      - WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "CDP719", "EMR_6_13" ]
+      - WASP_FLAVOR: [ "VANILLA2_2_12", "CDP719", "EMR_6_13"]
   script:
     - ./run-sbt-unprivileged.sh "clean coverage wasp-repository/test wasp-repository/coverageAggregate"
   after_script:
@@ -104,15 +104,15 @@ test-repo:
     - /^develop$/
     - /(^release\/v([0-9]+)\.([0-9]+))/
     - merge_requests
-  needs: [ ]
+  needs: []
 
 compile-whitelabel:
   stage: deploy
   interruptible: true
   image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-8u432-b06-jdk-jammy"
   parallel:
     matrix:
-      - WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "CDP719", "EMR_6_13" ]
+      - WASP_FLAVOR: [ "VANILLA2_2_12", "CDP719", "EMR_6_13"]
   script:
     - ./run-sbt-unprivileged.sh "clean wasp-whitelabel/test"
   tags:
@@ -121,13 +121,13 @@ compile-whitelabel:
     - /^develop$/
     - /(^release\/v([0-9]+)\.([0-9]+))/
     - merge_requests
-  needs: [ ]
+  needs: []
 
 censor:
   stage: censor
   interruptible: true
   image: "registry.gitlab.com/agilefactory/developers/censor:0.1.0"
-  only: [ merge_requests ]
+  only: [merge_requests]
   script:
     - ./censor.sh
 
@@ -145,8 +145,8 @@ generate-open-api:
     - merge_requests
     - tags
   artifacts:
-    paths: [ 'documentation/wasp-openapi.yaml' ]
-  needs: [ ]
+    paths: ['documentation/wasp-openapi.yaml']
+  needs: []
 
 
 waspctl:
@@ -156,7 +156,7 @@ waspctl:
   script:
     - bash waspctl/build-for-all-archs.bash
   artifacts:
-    paths: [ 'waspctl/output' ]
+    paths: ['waspctl/output']
   only:
     - /^develop$/
     - /(^release\/v([0-9]+)\.([0-9]+))/
@@ -173,7 +173,7 @@ snapshot:
   image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-8u432-b06-jdk-jammy"
   parallel:
     matrix:
-      - WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "CDP719", "EMR_6_13" ]
+      - WASP_FLAVOR: [ "VANILLA2_2_12", "CDP719", "EMR_6_13"]
   tags:
     - saas-linux-medium-arm64
   script:
@@ -197,7 +197,7 @@ release:
   image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-8u432-b06-jdk-jammy"
   parallel:
     matrix:
-      - WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "CDP719", "EMR_6_13" ]
+      - WASP_FLAVOR: [ "VANILLA2_2_12", "CDP719", "EMR_6_13"]
   script:
     - "mkdir -p $HOME/.sbt/gpg"
     - "echo $GPG_PUB | base64 -d > $HOME/.sbt/gpg/pubring.asc"
@@ -216,7 +216,7 @@ pages:
     - npm install gitbook-cli -g # install gitbook
     - gitbook fetch 3.2.3 # fetch final stable version
     - gitbook install # add any requested plugins in book.json
-    - |
+    - | 
       if [[ $CI_COMMIT_REF_NAME == 'develop'  ]]
       then 
         rm -rf public/*
@@ -243,8 +243,8 @@ pages:
       - public
   only:
     refs:
-      - merge_requests
-      - /^develop$/
+    - merge_requests
+    - /^develop$/
     changes:
-      - documentation/*
+    - documentation/*
 

project/Flavor.scala

@@ -8,17 +8,8 @@ sealed trait Flavor {
 
 object Flavor {
 
-  case object Vanilla2 extends Flavor {
-    private val versions                    = new Vanilla2Versions()
-    val postfix: Option[String]             = None
-    override val scalaVersion: ScalaVersion = ScalaVersion.parseScalaVersion(versions.scala)
-    override val settings: Settings         = new BasicSettings(new BasicResolvers(), versions.jdk, scalaVersion)
-    override val dependencies: Dependencies = new Vanilla2Dependencies(versions)
-    override val id: String                 = "VANILLA2"
-  }
-
   case object Vanilla2_2_12 extends Flavor {
-    private val versions                    = new Vanilla2_212_Versions()
+    private val versions                    = new Vanilla2Versions()
     val postfix: Option[String]             = None
     override val scalaVersion: ScalaVersion = ScalaVersion.parseScalaVersion(versions.scala)
     override val settings: Settings         = new BasicSettings(new BasicResolvers(), versions.jdk, scalaVersion)
@@ -45,28 +36,21 @@ object Flavor {
   case object EMR613 extends Flavor {
     override val scalaVersion: ScalaVersion = ScalaVersion.parseScalaVersion(versions.scala)
     override lazy val settings: Settings =
-      new BasicSettings(
-        new BasicResolvers(),
-        versions.jdk,
-        scalaVersion,
-        dependencies.overrides,
-        dependencies.removeShims
-      )
+      new BasicSettings(new BasicResolvers(), versions.jdk, scalaVersion, dependencies.overrides, dependencies.removeShims)
     override lazy val dependencies: EMR613Dependencies = new EMR613Dependencies(versions)
-    lazy val postfix: Option[String]                   = Some("emr613")
-    private lazy val versions                          = new EMR613Versions()
-    override val id: String                            = "EMR_6_13"
+    lazy val postfix: Option[String] = Some("emr613")
+    private lazy val versions = new EMR613Versions()
+    override val id: String = "EMR_6_13"
   }
 
   val DEFAULT: Flavor = Vanilla2_2_12
 
   def parse(s: String): Either[String, Flavor] = {
     s.toUpperCase match {
-      case "VANILLA2"      => Right(Vanilla2)
       case "VANILLA2_2_12" => Right(Vanilla2_2_12)
-      case "CDP719"        => Right(CDP719)
-      case "EMR_6_13"      => Right(EMR613)
-      case _               => Left(s"Cannot parse flavor [${s}]")
+      case "CDP719"   => Right(CDP719)
+      case "EMR_6_13" => Right(EMR613)
+      case _      => Left(s"Cannot parse flavor [${s}]")
     }
   }
 
@@ -79,7 +63,7 @@ object Flavor {
 }
 
 case class ScalaVersion(major: Int, minor: Int, revision: Int) {
-  val raw: String                               = s"$major.$minor.$revision"
+  val raw: String = s"$major.$minor.$revision"
   def isMajorMinor(maj: Int, min: Int): Boolean = maj == major && min == minor
 }
 object ScalaVersion {

project/Vanilla2Dependencies.scala

@@ -2,7 +2,7 @@ import com.typesafe.sbt.packager.Keys.scriptClasspath
 import sbt._
 import sbt.Keys.transitiveClassifiers
 
-class Vanilla2Dependencies(val versions: Vanilla2_212_Versions)
+class Vanilla2Dependencies(val versions: Vanilla2Versions)
     extends Dependencies
     with Vanilla2AkkaDependencies
     with Vanilla2DarwinDependencies
@@ -291,7 +291,7 @@ class Vanilla2Dependencies(val versions: Vanilla2_212_Versions)
 }
 
 trait Vanilla2AkkaDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
   val exclusions: VanillaExclusions.type
   lazy val akkaActor          = "com.typesafe.akka"     %% "akka-actor"              % versions.akka
   lazy val akkaCluster        = "com.typesafe.akka"     %% "akka-cluster"            % versions.akka
@@ -319,7 +319,7 @@ trait Vanilla2AkkaDependencies {
 }
 
 trait Vanilla2DarwinDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
   val exclusions: VanillaExclusions.type
   lazy val darwinCore           = "it.agilelab" %% "darwin-core"             % versions.darwin
   lazy val darwinHBaseConnector = "it.agilelab" %% "darwin-hbase2-connector" % versions.darwin
@@ -332,7 +332,7 @@ trait Vanilla2DarwinDependencies {
 }
 
 trait Vanilla2HBaseDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
   val exclusions: VanillaExclusions.type
   lazy val hbaseClient2NoScope    = "org.apache.hbase" % "hbase-client" % versions.hbase2 exclude exclusions.hbaseExclusion
   lazy val hbaseCommon2NoScope    = "org.apache.hbase" % "hbase-common" % versions.hbase2 exclude exclusions.hbaseExclusion
@@ -364,7 +364,7 @@ trait Vanilla2SparkDependencies extends Vanilla2HadoopDependencies {
 }
 
 trait Vanilla2HadoopDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
   val exclusions: VanillaExclusions.type
   lazy val hadoopCommonNoScope = "org.apache.hadoop" % "hadoop-common" % versions.hadoop
   lazy val hadoopCommon        = hadoopCommonNoScope % Provided
@@ -373,7 +373,7 @@ trait Vanilla2HadoopDependencies {
 }
 
 trait Vanilla2LoggingDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
   val exclusions: VanillaExclusions.type
   lazy val slf4jApi           = "org.slf4j" % "slf4j-api" % versions.slf4j
   lazy val slf4jLog4j1Binding = "org.slf4j" % "slf4j-log4j12" % versions.slf4j
@@ -382,7 +382,7 @@ trait Vanilla2LoggingDependencies {
 }
 
 trait Vanilla2KafkaDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
   val exclusions: VanillaExclusions.type
   lazy val kafka            = "org.apache.kafka" %% "kafka" % versions.kafka exclude (exclusions.kafkaExclusions ++ exclusions.jacksonExclude) // TODO remove jersey?
   lazy val kafkaClients     = "org.apache.kafka" % "kafka-clients" % versions.kafka exclude (exclusions.kafkaExclusions ++ exclusions.jacksonExclude) // TODO remove jersey?
@@ -393,7 +393,7 @@ trait Vanilla2KafkaDependencies {
 }
 
 trait Vanilla2MongoDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
   val exclusions: VanillaExclusions.type
   lazy val mongodbScala        = "org.mongodb.scala" %% "mongo-scala-driver"    % versions.mongodbScala
   lazy val mongoBsonScala      = "org.mongodb.scala" %% "mongo-scala-bson"      % versions.mongodbScala
@@ -402,7 +402,7 @@ trait Vanilla2MongoDependencies {
 }
 
 trait Vanilla2Json4sDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
   val exclusions: VanillaExclusions.type
   lazy val json4sCore    = "org.json4s" %% "json4s-core" % versions.json4s % Provided exclude exclusions.jacksonExclude
   lazy val json4sJackson = "org.json4s" %% "json4s-jackson" % versions.json4s % Provided exclude exclusions.jacksonExclude
@@ -411,14 +411,14 @@ trait Vanilla2Json4sDependencies {
 }
 
 trait Vanilla2NettyDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
   lazy val netty      = "io.netty" % "netty"     % versions.nettySpark    % Provided
   lazy val nettySpark = "io.netty" % "netty"     % versions.nettySpark    % Provided
   lazy val nettyAll   = "io.netty" % "netty-all" % versions.nettyAllSpark % Provided
 }
 
 trait Vanilla2TestFrameworkDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
   val exclusions: VanillaExclusions.type
   lazy val scalaTest        = "org.scalatest"  %% "scalatest"     % versions.scalaTest        % Test
   lazy val scalaCheck       = "org.scalacheck" %% "scalacheck"    % versions.scalaCheck       % Test
@@ -430,7 +430,7 @@ trait Vanilla2TestFrameworkDependencies {
 }
 
 trait Vanilla2ScalaCoreDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
   lazy val typesafeConfig            = "com.typesafe"           % "config"                    % versions.typesafeConfig
   lazy val scalaParserAndCombinators = "org.scala-lang.modules" %% "scala-parser-combinators" % versions.scalaParserAndCombinators
   lazy val nameOf                    = "com.github.dwickern"    %% "scala-nameof"             % versions.nameOf
@@ -439,7 +439,7 @@ trait Vanilla2ScalaCoreDependencies {
 }
 
 trait Vanilla2AvroDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
   val exclusions: VanillaExclusions.type
   lazy val avro       = "org.apache.avro"     % "avro"         % versions.avro % Provided
   lazy val avro4sCore = "com.sksamuel.avro4s" %% "avro4s-core" % versions.avro4sVersion exclude exclusions.json4sExclude
@@ -450,7 +450,7 @@ trait Vanilla2AvroDependencies {
 }
 
 trait Vanilla2ApacheCommonsDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
   lazy val apacheCommonsLang3 = "org.apache.commons"        % "commons-lang3" % versions.apacheCommonsLang3Version // remove?
   lazy val commonsCli         = "commons-cli"               % "commons-cli"   % versions.commonsCli % Provided
   lazy val httpClient         = "org.apache.httpcomponents" % "httpclient"    % versions.httpcomponents
@@ -461,7 +461,7 @@ trait Vanilla2ApacheCommonsDependencies {
 }
 
 trait Vanilla2SolrDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
   val exclusions: VanillaExclusions.type
   lazy val solrj = "org.apache.solr" % "solr-solrj" % versions.solr exclude exclusions.solrExclusion
   lazy val sparkSolr = versions.scala.take(4) match {
@@ -476,29 +476,29 @@ trait Vanilla2SolrDependencies {
 }
 
 trait Vanilla2SttpDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
   val exclusions: VanillaExclusions.type
   lazy val sttpCore   = "com.softwaremill.sttp.client" %% "core"   % versions.sttpVersion exclude exclusions.json4sExclude
   lazy val sttpJson4s = "com.softwaremill.sttp.client" %% "json4s" % versions.sttpVersion exclude exclusions.json4sExclude
 }
 
 trait Vanilla2CodehausJacksonDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
 
   lazy val codeHausJacksonCoreAsl   = "org.codehaus.jackson" % "jackson-core-asl"   % versions.codeHausJackson
   lazy val codeHausJacksonJaxRS     = "org.codehaus.jackson" % "jackson-jaxrs"      % versions.codeHausJackson
   lazy val codeHausJacksonMapperAsl = "org.codehaus.jackson" % "jackson-mapper-asl" % versions.codeHausJackson
 }
 
 trait Vanilla2OkHttpDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
 
   lazy val mockOkHttp2 = "com.squareup.okhttp" % "mockwebserver" % versions.okHttp % Test // in sync with cdh6
   lazy val okHttp2     = "com.squareup.okhttp" % "okhttp"        % versions.okHttp // in sync with cdh6
 }
 
 trait Vanilla2PostgresDependencies {
-  val versions: Vanilla2_212_Versions
+  val versions: Vanilla2Versions
 
   lazy val postgres                     = "org.postgresql"         % "postgresql"                                % versions.postgresqlVersion
   lazy val postgresqlEmbedded           = "io.zonky.test"          % "embedded-postgres"                         % versions.postgresqlEmbeddedVersion % Test

project/Vanilla2Versions.scala

@@ -1,4 +1,4 @@
-class Vanilla2_212_Versions {
+class Vanilla2Versions {
   val akka                      = "2.4.20" // do not use akka 2.5+ until spark has removed their dependency on akka 2.3, otherwise master & consumer won't be able to communicate
   val akkaHttp                  = "10.0.9" // keep in sync with akka
   val apacheCommonsLang3Version = "3.4"
@@ -62,9 +62,3 @@ class Vanilla2_212_Versions {
   val scala                     = "2.12.10"
   val elasticSearchSpark        = "7.15.0"
 }
-
-class Vanilla2Versions extends Vanilla2_212_Versions {
-  override val akkaKryo           = "0.5.0"
-  override val elasticSearchSpark = "6.1.2"
-  override val scala              = "2.11.12"
-}