Merge branch 'main' into feat/1454-smp-success-on-parent-step-5

bcgov · Oct 1, 2024 · 0dbb0d4 · 0dbb0d4
2 parents 3895b7e + cb93189
commit 0dbb0d4
Show file tree

Hide file tree

Showing 17 changed files with 1,008 additions and 1,113 deletions.
diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
@@ -36,7 +36,7 @@ jobs:
       fam-modded-zone: ${{ steps.fam-modded-zone.outputs.fam-modded-zone }}
       deploy_core: ${{ steps.triggers.outputs.core }}
       deploy_sync: ${{ steps.triggers.outputs.sync }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       # Check triggers (omitted or matched)
       - name: Check core triggers
@@ -70,7 +70,7 @@ jobs:
 
       - name: OpenShift Init
         if: steps.triggers.outputs.core == 'true' || steps.triggers.outputs.sync == 'true'
-        uses: bcgov-nr/[email protected].0
+        uses: bcgov-nr/[email protected].1
         with:
           oc_namespace: ${{ vars.OC_NAMESPACE }}
           oc_server: ${{ vars.OC_SERVER }}
@@ -92,7 +92,7 @@ jobs:
 
       - name: Database
         if: steps.triggers.outputs.core == 'true' || steps.triggers.outputs.sync == 'true'
-        uses: bcgov-nr/[email protected].0
+        uses: bcgov-nr/[email protected].1
         with:
           oc_namespace: ${{ vars.OC_NAMESPACE }}
           oc_server: ${{ vars.OC_SERVER }}
@@ -110,7 +110,7 @@ jobs:
     environment: ${{ inputs.environment }}
     if: needs.init.outputs.deploy_core == 'true'
     needs: [init]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 10
     strategy:
       matrix:
@@ -140,7 +140,7 @@ jobs:
             verification_path: "actuator/health"
 
     steps:
-      - uses: bcgov-nr/[email protected].0
+      - uses: bcgov-nr/[email protected].1
         id: deploys
         with:
           file: ${{ matrix.file }}
@@ -167,7 +167,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Deploy (sync)
-        uses: bcgov-nr/[email protected].0
+        uses: bcgov-nr/[email protected].1
         with:
           file: sync/openshift.deploy.yml
           oc_namespace: ${{ vars.OC_NAMESPACE }}

diff --git a/.github/workflows/.tests.yml b/.github/workflows/.tests.yml
@@ -28,7 +28,7 @@ jobs:
       VITE_USER_POOLS_ID: ${{ vars.VITE_USER_POOLS_ID }}
       VITE_USER_POOLS_WEB_CLIENT_ID: ${{ secrets.VITE_USER_POOLS_WEB_CLIENT_ID }}
       VITE_ZONE: TEST
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       # Check triggers (omitted or matched)
       - uses: bcgov-nr/[email protected]
@@ -49,7 +49,7 @@ jobs:
           node_version: "18"
           commands: |
             npm ci
-            npm run cy:ci
+            npm run cy:ci || true
           dir: frontend
           sonar_args: >
             -Dsonar.organization=bcgov-sonarcloud

diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -16,7 +16,7 @@ concurrency:
 jobs:
   lint:
     name: Typescript lint
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: bcgov-nr/[email protected]
         with:
@@ -29,7 +29,7 @@ jobs:
   tests:
     name: Java CI
     if: ${{ ! github.event.pull_request.draft }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         dir: [backend, oracle-api]
@@ -56,7 +56,7 @@ jobs:
   trivy:
     name: Security Scan
     if: ${{ ! github.event.pull_request.draft }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Run Trivy vulnerability scanner in repo mode
@@ -78,6 +78,6 @@ jobs:
     name: Analysis Results
     if: always() && (!failure()) && (!cancelled())
     needs: [lint, tests, trivy]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - run: echo "Workflow completed successfully!"
diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml
@@ -24,6 +24,9 @@ jobs:
       REPO: ${{ github.event.repository.name }}
     runs-on: ubuntu-latest
     steps:
+      - uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Point DEMO URL to Existing Service
         run: |
           # Set Up Routing

diff --git a/.github/workflows/job-nightly.yml b/.github/workflows/job-nightly.yml
@@ -18,6 +18,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
+      - uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - run: |
           # Login to OpenShift
           oc login --token=${{ secrets.OC_TOKEN }} --server=${{ vars.OC_SERVER }}

diff --git a/.github/workflows/job-sync.yml b/.github/workflows/job-sync.yml
@@ -14,16 +14,10 @@ jobs:
     name: Sync (TEST)
     runs-on: ubuntu-latest
     steps:
-      - name: Override OpenShift version
-        env:
-          OC: https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-4.13/openshift-client-linux.tar.gz
-        run: |
-          # Download and extract with retry, continuing on error
-          (wget ${{ env.OC }} -qcO - | tar -xzvf - oc)|| !! || true
-          oc version
-        working-directory: /usr/local/bin/
-
       - uses: actions/checkout@v4
+      - uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: ETL (TEST)
         run: ./sync/oc_run.sh test ${{ secrets.oc_token }}
 
@@ -32,15 +26,9 @@ jobs:
     name: Sync (PROD)
     runs-on: ubuntu-latest
     steps:
-      - name: Override OpenShift version
-        env:
-          OC: https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-4.13/openshift-client-linux.tar.gz
-        run: |
-          # Download and extract with retry, continuing on error
-          (wget ${{ env.OC }} -qcO - | tar -xzvf - oc)|| !! || true
-          oc version
-        working-directory: /usr/local/bin/
-
       - uses: actions/checkout@v4
+      - uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: ETL (PROD)
         run: ./sync/oc_run.sh prod ${{ secrets.oc_token }}
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -11,7 +11,7 @@ concurrency:
 jobs:
   builds:
     name: Builds
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       triggered: ${{ steps.build.outputs.triggered }}
     permissions:
@@ -49,7 +49,7 @@ jobs:
     if: always()
     # Include all needs that could have failures!
     needs: [builds, deploys, tests]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - run: |
           # View results

diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml
@@ -13,7 +13,7 @@ jobs:
     name: Initialize
     outputs:
       mod-tag: ${{ steps.mod-tag.outputs.mod-tag }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Get PR Number Mod 50
         id: mod-tag
@@ -33,6 +33,6 @@ jobs:
     name: Validate Results
     if: always() && (!failure()) && (!cancelled())
     needs: [validate]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - run: echo "Success!"
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.4</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
   <groupId>ca.bc.gov</groupId>
@@ -39,7 +39,7 @@
     <sonar.organization>bcgov-sonarcloud</sonar.organization>
     <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     <oci.revision>${project.version}</oci.revision>
-    <hibernate.version>6.5.2.Final</hibernate.version>
+    <hibernate.version>6.5.3.Final</hibernate.version>
   </properties>
 
   <profiles>
@@ -403,7 +403,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.10.0</version>
+        <version>3.10.1</version>
         <configuration>
           <source>17</source>
           <doctitle>Javadoc Documentation for ${project.name} ${project.version}</doctitle>
@@ -459,7 +459,7 @@
           <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>10.18.1</version>
+            <version>10.18.2</version>
           </dependency>
         </dependencies>
         <configuration>
@@ -506,7 +506,7 @@
       <dependency>
         <groupId>com.nimbusds</groupId>
         <artifactId>nimbus-jose-jwt</artifactId>
-        <version>9.40</version>
+        <version>9.41.2</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

diff --git a/backend/src/main/java/ca/bc/gov/backendstartapi/service/ParentTreeService.java b/backend/src/main/java/ca/bc/gov/backendstartapi/service/ParentTreeService.java
@@ -93,7 +93,7 @@ public PtCalculationResDto calculatePtVals(PtValsCalReqDto ptVals) {
         parentPropOrchPoll = zero;
       } else {
         parentPropOrchPoll =
-            parentTreeRow.coneCount().divide(totalPollenCount, DIVISION_SCALE, halfUp);
+            parentTreeRow.pollenCount().divide(totalPollenCount, DIVISION_SCALE, halfUp);
       }
 
       // --col:X