From de32291fa820e746db480bc88341e3d83e7d3626 Mon Sep 17 00:00:00 2001
From: Darin Kelkhoff <darin.kelkhoff@gmail.com>
Date: Wed, 22 Jun 2022 11:30:34 -0500
Subject: [PATCH] QQQ-14 moving usr-lib-jvm cache into the install_java17
 command

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index af5c1807..7743d386 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,11 +16,18 @@ orbs:
 commands:
   install_java17:
     steps:
+      - restore_cache:
+          keys:
+            - usr-lib-jvm
       - run:
           name: Install Java 17
           command: |
             if [ ! -e "/usr/lib/jvm/java-17-openjdk-amd64" ]; then sudo add-apt-repository -y ppa:openjdk-r/ppa && sudo apt install -y openjdk-17-jdk; else echo "java 17 already installed"; fi
             sudo rm /etc/alternatives/java && sudo ln -s /usr/lib/jvm/java-17-openjdk-amd64/bin/java /etc/alternatives/java
+      - save_cache:
+          paths:
+            - /usr/lib/jvm/
+          key: usr-lib-jvm
   run_maven:
     parameters:
       maven_subcommand:
@@ -31,9 +38,6 @@ commands:
       - restore_cache:
           keys:
             - v1-dependencies-{{ checksum "pom.xml" }}
-      - restore_cache:
-          keys:
-            - usr-lib-jvm
       - run:
           name: Run Maven
           command: |
@@ -50,10 +54,6 @@ commands:
           paths:
             - ~/.m2
           key: v1-dependencies-{{ checksum "pom.xml" }}
-      - save_cache:
-          paths:
-            - /usr/lib/jvm/
-          key: usr-lib-jvm
 
 jobs:
   mvn_test: