From 0fc1eeac8f33fda6c6ab8e6ee9547d7c0744aefe Mon Sep 17 00:00:00 2001 From: SoLetsDev <74216496+SoLetsDev@users.noreply.github.com> Date: Mon, 16 Oct 2023 09:42:51 -0700 Subject: [PATCH] WIP reverting application-openshift redis properties. Updating zap scan to not use node 12. Updating springboot parent version to 3.1.4 and adding in GroupID for maven compiler plugin --- .github/workflows/deploy-to.openshift-dev.yml | 2 +- .github/workflows/deploy-to.openshift-test.yml | 2 +- api/pom.xml | 3 ++- api/src/main/resources/application-openshift.properties | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-to.openshift-dev.yml b/.github/workflows/deploy-to.openshift-dev.yml index 4d08004b..edf037ba 100644 --- a/.github/workflows/deploy-to.openshift-dev.yml +++ b/.github/workflows/deploy-to.openshift-dev.yml @@ -165,6 +165,6 @@ jobs: # Get status, returns 0 if rollout is successful oc rollout status dc/${{ env.SPRING_BOOT_IMAGE_NAME }} - name: ZAP Scan - uses: zaproxy/action-api-scan@v0.2.0 + uses: zaproxy/action-api-scan@v0.5.0 with: target: 'https://${{ env.APP_NAME }}-${{ env.OPENSHIFT_NAMESPACE_DEV }}.apps.silver.devops.gov.bc.ca/v3/api-docs' \ No newline at end of file diff --git a/.github/workflows/deploy-to.openshift-test.yml b/.github/workflows/deploy-to.openshift-test.yml index f28f85e7..3ccc4f57 100644 --- a/.github/workflows/deploy-to.openshift-test.yml +++ b/.github/workflows/deploy-to.openshift-test.yml @@ -131,6 +131,6 @@ jobs: oc rollout status dc/${{ env.SPRING_BOOT_IMAGE_NAME }} - name: ZAP Scan - uses: zaproxy/action-api-scan@v0.2.0 + uses: zaproxy/action-api-scan@v0.5.0 with: target: 'https://${{ env.APP_NAME }}-${{ env.OPENSHIFT_NAMESPACE_TEST }}.apps.silver.devops.gov.bc.ca/v3/api-docs' \ No newline at end of file diff --git a/api/pom.xml b/api/pom.xml index 9e5a5a0e..6e52d69d 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -39,7 +39,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2 + 3.1.4 @@ -312,6 +312,7 @@ + org.apache.maven.plugins maven-compiler-plugin ${maven.compiler.version} diff --git a/api/src/main/resources/application-openshift.properties b/api/src/main/resources/application-openshift.properties index b54a8a33..5a0d1e49 100644 --- a/api/src/main/resources/application-openshift.properties +++ b/api/src/main/resources/application-openshift.properties @@ -1,4 +1,4 @@ spring.data.redis.cluster.nodes=${URL_REDIS} spring.data.redis.cluster.max-redirects=6 -#spring.data.redis.lettuce.cluster.refresh.adaptive=true -#spring.data.redis.lettuce.cluster.refresh.period=5000 +spring.data.redis.lettuce.cluster.refresh.adaptive=true +spring.data.redis.lettuce.cluster.refresh.period=5000