Merge branch 'main' into AB2D-6340/Upgrade_spring

CMSgov · Nov 18, 2024 · d91d24f · d91d24f
2 parents adfb1c2 + 554c4ee
commit d91d24f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml
@@ -47,6 +47,7 @@ jobs:
             echo "TAG_PREFIX=ab2d-prod-test" >> $GITHUB_ENV
           else
             echo "TAG_PREFIX=ab2d-$DEPLOYMENT_ENV" >> $GITHUB_ENV
+          fi
 
       - name: Retag images in ECR
         env:

diff --git a/common/pom.xml b/common/pom.xml
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>${postgres.version}</version>
+            <version>${postgresql.version}</version>
         </dependency>
         <dependency>
             <groupId>org.liquibase</groupId>

diff --git a/job/pom.xml b/job/pom.xml
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>${postgres.version}</version>
+            <version>${postgresql.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -35,8 +35,9 @@
         <logback-encoder.version>7.3</logback-encoder.version>
         <testcontainers.version>1.20.1</testcontainers.version>
         <newrelic.version>8.15.0</newrelic.version>
-        <postgres.version>42.7.3</postgres.version>
         <spring-cloud-aws.version>3.1.1</spring-cloud-aws.version>
+        <postgresql.version>42.7.4</postgresql.version>
+
 
         <!-- Maven plugin versions -->
         <jacoco.version>0.8.10</jacoco.version>
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,6 +47,7 @@ jobs: @@
                 echo "TAG_PREFIX=ab2d-prod-test" >> $GITHUB_ENV
               else
                 echo "TAG_PREFIX=ab2d-$DEPLOYMENT_ENV" >> $GITHUB_ENV
+              fi
           - name: Retag images in ECR
             env:
@@ Expand Down @@