From 41d08f8e0d5fc1e7a56c063786dd77835600885b Mon Sep 17 00:00:00 2001
From: Kevin Davis <kdavisk6@gmail.com>
Date: Sat, 31 Dec 2022 13:36:35 -0500
Subject: [PATCH 1/2] Update CircleCI images

The older images are now deprecated, updating to new images.
---
 .circleci/config.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 414b063a8..f30c6cb78 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,7 +24,7 @@ executors:
         default: '8'
         type: string
     docker:
-      - image: circleci/openjdk:<<parameters.version>>
+      - image: cimg/openjdk:<<parameters.version>>
   android:
     parameters:
       version:
@@ -32,7 +32,7 @@ executors:
         default: '8'
         type: string
     docker:
-      - image: circleci/openjdk:<<parameters.version>>
+      - image: cimg/openjdk:<<parameters.version>>
 # common commands
 commands:
   resolve-dependencies:
@@ -181,17 +181,17 @@ workflows:
   build:
     jobs:
       - test:
-          jdk: '8'
+          jdk: '8.0'
           name: 'jdk 8'
           filters:
             <<: *all-branches
       - test:
-          jdk: '11'
+          jdk: '11.0'
           name: 'jdk 11'
           filters:
             <<: *all-branches
       - test:
-          jdk: '17-buster'
+          jdk: '17.0'
           name: 'jdk 17'
           filters:
             <<: *all-branches
@@ -202,22 +202,22 @@ workflows:
   snapshot:
     jobs:
       - test:
-          jdk: '8'
+          jdk: '8.0'
           name: 'jdk 8'
           filters:
             <<: *master-only
       - test:
-          jdk: '11'
+          jdk: '11.0'
           name: 'jdk 11'
           filters:
             <<: *master-only
       - test:
-          jdk: '17-buster'
+          jdk: '17.0'
           name: 'jdk 17'
           filters:
             <<: *master-only
       - deploy:
-          jdk: '8'
+          jdk: '8.0'
           name: 'deploy snapshot'
           requires:
             - 'jdk 8'
@@ -227,7 +227,7 @@ workflows:
           filters:
             <<: *master-only
       - deploy-jdk11:
-          jdk: '11'
+          jdk: '11.0'
           name: 'deploy jdk11 snapshot modules'
           requires:
             - 'jdk 11'
@@ -239,13 +239,13 @@ workflows:
   release:
     jobs:
       - deploy:
-          jdk: '8'
+          jdk: '8.0'
           name: 'release to maven central'
           context: Sonatype
           filters:
             <<: *tags-only
       - deploy-jdk11:
-          jdk: '11'
+          jdk: '11.0'
           name: 'release jdk11 artifacts to maven central'
           requires:
             - 'release to maven central'

From b264200ea5fcc59b9d328a36e5af067ad4d1f3c7 Mon Sep 17 00:00:00 2001
From: Kevin Davis <kdavisk6@gmail.com>
Date: Sat, 31 Dec 2022 13:42:36 -0500
Subject: [PATCH 2/2] Corrected Default image tags

---
 .circleci/config.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f30c6cb78..8421f4f86 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,7 +21,7 @@ executors:
     parameters:
       version:
         description: 'jdk version to use'
-        default: '8'
+        default: '8.0'
         type: string
     docker:
       - image: cimg/openjdk:<<parameters.version>>
@@ -29,7 +29,7 @@ executors:
     parameters:
       version:
         description: 'jdk version to use'
-        default: '8'
+        default: '8.0'
         type: string
     docker:
       - image: cimg/openjdk:<<parameters.version>>
@@ -101,7 +101,7 @@ jobs:
     parameters:
       jdk:
         description: 'jdk version to use'
-        default: '8'
+        default: '8.0'
         type: string
     executor:
       name: java
@@ -140,7 +140,7 @@ jobs:
     parameters:
       jdk:
         description: 'jdk version to use'
-        default: '8'
+        default: '8.0'
         type: string
     executor:
       name: java
@@ -160,7 +160,7 @@ jobs:
     parameters:
       jdk:
         description: 'jdk version to use'
-        default: '11'
+        default: '11.0'
         type: string
     executor:
       name: java