From 7b5c0aa191086afc065a910a31a10cfe0e7d74ba Mon Sep 17 00:00:00 2001
From: kevincranmer <cranmerkevin39@gmail.com>
Date: Fri, 16 Jun 2023 11:29:42 -0500
Subject: [PATCH 1/2] Parent Version Bump to 14.0.0

---
 Jenkinsfile.disabled                                    | 2 +-
 patient-generated-data-synthetic/pom.xml                | 2 +-
 patient-generated-data-tests/pom.xml                    | 2 +-
 patient-generated-data-tests/src/main/docker/Dockerfile | 2 +-
 patient-generated-data/pom.xml                          | 2 +-
 pom.xml                                                 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile.disabled b/Jenkinsfile.disabled
index 84585a49..d0a4b4f8 100644
--- a/Jenkinsfile.disabled
+++ b/Jenkinsfile.disabled
@@ -1,4 +1,4 @@
 standardMavenPipeline {
-  healthApisMavenImage='vasdvp/health-apis-dev-tools:mvn-3.8-jdk-16'
+  healthApisMavenImage='ghcr.io/department-of-veterans-affairs/health-apis-docker-octopus/java-test-base:v2-jdk17'
   slackChannels = [ 'health_apis_jenkins', 'pteralerts' ]
 }
diff --git a/patient-generated-data-synthetic/pom.xml b/patient-generated-data-synthetic/pom.xml
index d6b60159..f5a90d5a 100644
--- a/patient-generated-data-synthetic/pom.xml
+++ b/patient-generated-data-synthetic/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>gov.va.api.health</groupId>
     <artifactId>health-apis-parent</artifactId>
-    <version>12.0.2</version>
+    <version>14.0.0</version>
     <relativePath/>
   </parent>
   <artifactId>patient-generated-data-synthetic</artifactId>
diff --git a/patient-generated-data-tests/pom.xml b/patient-generated-data-tests/pom.xml
index f349bc4c..a1a276ef 100644
--- a/patient-generated-data-tests/pom.xml
+++ b/patient-generated-data-tests/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>gov.va.api.health</groupId>
     <artifactId>test-starter</artifactId>
-    <version>12.0.2</version>
+    <version>14.0.0</version>
     <relativePath/>
   </parent>
   <artifactId>patient-generated-data-tests</artifactId>
diff --git a/patient-generated-data-tests/src/main/docker/Dockerfile b/patient-generated-data-tests/src/main/docker/Dockerfile
index 67d28576..dfefa700 100644
--- a/patient-generated-data-tests/src/main/docker/Dockerfile
+++ b/patient-generated-data-tests/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM vasdvp/health-apis-dev-tools:mvn-3.8-jdk-16
+FROM ghcr.io/department-of-veterans-affairs/health-apis-docker-octopus/java-test-base:v2-jdk17
 
 COPY maven/ /sentinel
 RUN chmod 755 /sentinel/*sh
diff --git a/patient-generated-data/pom.xml b/patient-generated-data/pom.xml
index e9747128..3ab10d7f 100644
--- a/patient-generated-data/pom.xml
+++ b/patient-generated-data/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>gov.va.api.health</groupId>
     <artifactId>service-starter</artifactId>
-    <version>12.0.2</version>
+    <version>14.0.0</version>
     <relativePath/>
   </parent>
   <artifactId>patient-generated-data</artifactId>
diff --git a/pom.xml b/pom.xml
index 4be6b700..0886284c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>gov.va.api.health</groupId>
     <artifactId>health-apis-parent</artifactId>
-    <version>12.0.2</version>
+    <version>14.0.0</version>
   </parent>
   <artifactId>patient-generated-data-parent</artifactId>
   <version>4.0.2-SNAPSHOT</version>

From 5e43a72f1cae3de95620db389604d11c998a5a8c Mon Sep 17 00:00:00 2001
From: kevincranmer <cranmerkevin39@gmail.com>
Date: Fri, 16 Jun 2023 12:43:33 -0500
Subject: [PATCH 2/2] Use OG image for jenkinsfile

---
 Jenkinsfile.disabled | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile.disabled b/Jenkinsfile.disabled
index d0a4b4f8..c06f42d4 100644
--- a/Jenkinsfile.disabled
+++ b/Jenkinsfile.disabled
@@ -1,4 +1,4 @@
 standardMavenPipeline {
-  healthApisMavenImage='ghcr.io/department-of-veterans-affairs/health-apis-docker-octopus/java-test-base:v2-jdk17'
+  healthApisMavenImage='ghcr.io/department-of-veterans-affairs/health-apis-docker-octopus/dev-tools:mvn-3.8-jdk-17'
   slackChannels = [ 'health_apis_jenkins', 'pteralerts' ]
 }