From 489e52f66ebae00c0db7874be9c8c9700990e5a3 Mon Sep 17 00:00:00 2001
From: Jason Han <jason.han@jpl.nasa.gov>
Date: Thu, 24 Feb 2022 14:00:08 -0800
Subject: [PATCH 1/3] Change back jdk version to 11

---
 .circleci/config.yml | 2 +-
 Dockerfile           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 59f934de7..8b66228c7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ orbs:
 executors:
     openjdk_executor:
         docker:
-            - image: cimg/openjdk:17.0.2
+            - image: circleci/openjdk:11.0.8-jdk
         environment:
             _JAVA_OPTIONS: "-Xmx3g"
             GRADLE_OPTS: "-Dorg.gradle.daemon=false"
diff --git a/Dockerfile b/Dockerfile
index cf3bf4e0a..861eeb446 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:15-jdk-slim
+FROM openjdk:11-jdk-slim
 COPY . /mms
 WORKDIR /mms
 RUN ./gradlew --no-daemon bootJar

From 71dd3caacec5bed70421c256f2d9a313583cd352 Mon Sep 17 00:00:00 2001
From: Jason Han <jason.han@jpl.nasa.gov>
Date: Thu, 24 Feb 2022 14:03:44 -0800
Subject: [PATCH 2/3] Change back spring boot older version

---
 example/example.gradle | 3 ---
 gradle.properties      | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/example/example.gradle b/example/example.gradle
index bbdd23269..87b646db8 100644
--- a/example/example.gradle
+++ b/example/example.gradle
@@ -38,9 +38,6 @@ dependencies {
     )
 }
 
-bootJar {
-    duplicatesStrategy(DuplicatesStrategy.INCLUDE)
-}
 //https://stackoverflow.com/questions/61197984/bootjar-mavenjar-artifact-wasnt-produced-by-this-build
 configurations {
     [apiElements, runtimeElements].each {
diff --git a/gradle.properties b/gradle.properties
index bf04fcefd..a642f3e58 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 version=4.0.6
 group=org.openmbee.mms
 
-springBootVersion=2.3.2.RELEASE
+springBootVersion=2.2.6.RELEASE
 springFrameworkVersion=5.2.5.RELEASE
 springSecurityVersion=5.3.1.RELEASE
 springDataVersion=2.2.6.RELEASE

From d4e48aa17353196b0d657414897dec9bc423bf8b Mon Sep 17 00:00:00 2001
From: Jason Han <jason.han@jpl.nasa.gov>
Date: Thu, 24 Feb 2022 14:04:33 -0800
Subject: [PATCH 3/3] Bump version

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index a642f3e58..6e7ed6e40 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=4.0.6
+version=4.0.7
 group=org.openmbee.mms
 
 springBootVersion=2.2.6.RELEASE