Skip to content

Commit

Permalink
WIP reverting application-openshift redis properties. Updating zap sc…
Browse files Browse the repository at this point in the history
…an to not use node 12. Updating springboot parent version to 3.1.4 and adding in GroupID for maven compiler plugin
  • Loading branch information
SoLetsDev committed Oct 16, 2023
1 parent 8912705 commit 0fc1eea
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to.openshift-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to.openshift-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
3 changes: 2 additions & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.2</version>
<version>3.1.4</version>
</parent>

<dependencies>
Expand Down Expand Up @@ -312,6 +312,7 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.version}</version>
<configuration>
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/resources/application-openshift.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 0fc1eea

Please sign in to comment.