W-14661042 - Use base-image 1.4.0. Publish 2.1.0

Author: looseale

Dockerfile

@@ -1 +1 @@
-FROM ghcr.io/aml-org/amf-ci-tools-base-image:1.4.0-java21.test.0
+FROM ghcr.io/aml-org/amf-ci-tools-base-image:1.4.0

Jenkinsfile

@@ -44,7 +44,6 @@ pipeline {
             when {
                 anyOf {
                     branch 'master'
-                    branch 'java21-2024'
                 }
             }
             steps {
@@ -60,7 +59,6 @@ pipeline {
             when {
                 anyOf {
                     branch 'master'
-                    branch 'java21-2024'
                 }
             }
             steps {

build.sbt

@@ -1,8 +1,7 @@
 import sbtcrossproject.CrossPlugin.autoImport.crossProject
 import sbtsonar.SonarPlugin.autoImport.sonarProperties
 
-//ThisBuild / version := getVersion(2, 0)
-ThisBuild / version := "2.1.0-java21-0"
+ThisBuild / version := getVersion(2, 1)
 ThisBuild / scalacOptions ++= Seq("-feature")
 ThisBuild / scalaVersion := "2.12.20"