diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4efc24c7ba1..357b068edf8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -128,7 +128,7 @@ commands: # a reusable command with parameters
 jobs:
   node0:
     machine:
-      image: circleci/classic:latest
+      image: ubuntu-2004:202201-02
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -141,7 +141,7 @@ jobs:
           nodeNo: "0"
   node1:
     machine:
-      image: circleci/classic:latest
+      image: ubuntu-2004:202201-02
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -154,7 +154,7 @@ jobs:
           nodeNo: "1"
   node2:
     machine:
-      image: circleci/classic:latest
+      image: ubuntu-2004:202201-02
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -167,7 +167,7 @@ jobs:
           nodeNo: "2"
   node3:
     machine:
-      image: circleci/classic:latest
+      image: ubuntu-2004:202201-02
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -201,4 +201,4 @@ workflows:
       - node1
       - node2
       - node3
-      - node4
\ No newline at end of file
+      - node4
diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh
index b6e2691121a..01960b8f3e4 100755
--- a/CI/circle_parallel.sh
+++ b/CI/circle_parallel.sh
@@ -25,22 +25,15 @@ if [ "$NODE_INDEX" = "1" ]; then
   mvn --no-snapshot-updates --quiet verify -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
 
 elif [ "$NODE_INDEX" = "2" ]; then
-  echo "Running node $NODE_INDEX to test haskell"
+  echo "Running node $NODE_INDEX to test Go"
   # install haskell
   #curl -sSLk https://get.haskellstack.org/ | sh
   #stack upgrade
   #stack --version
-  # prepare r
-  sudo sh -c 'echo "deb http://cran.rstudio.com/bin/linux/ubuntu trusty/" >> /etc/apt/sources.list'
-  gpg --keyserver keyserver.ubuntu.com --recv-key E084DAB9
-  gpg -a --export E084DAB9 | sudo apt-key add -
-  sudo apt-get update
-  sudo apt-get -y install r-base
-  R --version
 
   # install curl
-  sudo apt-get -y build-dep libcurl4-gnutls-dev
-  sudo apt-get -y install libcurl4-gnutls-dev
+  #sudo apt-get -y build-dep libcurl4-gnutls-dev
+  #sudo apt-get -y install libcurl4-gnutls-dev
 
   # Install golang version 1.14
   go version
diff --git a/pom.xml b/pom.xml
index 41ae85e7f29..63c0278abe3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1248,7 +1248,6 @@
                 <!-- test java-related projects -->
                 <module>samples/client/petstore/scala-akka</module>
                 <module>samples/client/petstore/scala-sttp</module>
-                <module>samples/client/petstore/scala-httpclient</module>
                 <module>samples/client/petstore/clojure</module>
                 <module>samples/client/petstore/java/jersey2-java8</module>
                 <module>samples/openapi3/client/petstore/java/jersey2-java8</module>
@@ -1285,7 +1284,6 @@
             </activation>
             <modules>
                 <!-- clients -->
-                <module>samples/client/petstore/R</module>
                 <!--<module>samples/client/petstore/haskell-http-client</module>-->
                 <!-- servers -->
                 <!--<module>samples/server/petstore/haskell-servant</module>-->
diff --git a/samples/client/petstore/scala-httpclient/build.sbt b/samples/client/petstore/scala-httpclient/build.sbt
index d6eb1a71689..196e17ab735 100644
--- a/samples/client/petstore/scala-httpclient/build.sbt
+++ b/samples/client/petstore/scala-httpclient/build.sbt
@@ -4,8 +4,8 @@ organization := "org.openapitools"
 scalaVersion := "2.11.12"
 
 libraryDependencies ++= Seq(
-  "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.9",
-  "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9",
+  "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.13.2",
+  "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.13.2",
   "com.sun.jersey" % "jersey-core" % "1.19.4",
   "com.sun.jersey" % "jersey-client" % "1.19.4",
   "com.sun.jersey.contribs" % "jersey-multipart" % "1.19.4",
@@ -13,7 +13,7 @@ libraryDependencies ++= Seq(
   "io.swagger" % "swagger-core" % "1.5.8",
   "joda-time" % "joda-time" % "2.9.9",
   "org.joda" % "joda-convert" % "1.9.2",
-  "org.scalatest" %% "scalatest" % "3.0.4" % "test",
+  "org.scalatest" %% "scalatest" % "3.2.11" % "test",
   "junit" % "junit" % "4.13" % "test",
   "com.wordnik.swagger" %% "swagger-async-httpclient" % "0.3.5"
 )