Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dependabot/maven/com.s…
Browse files Browse the repository at this point in the history
…quareup.okhttp3-okhttp-4.12.0
  • Loading branch information
klaramargrethehelgemo committed Apr 24, 2024
2 parents 2428ca8 + ea87508 commit 7badb67
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .nais/application/application-config-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ spec:
- application: veilarbpersonflate
namespace: poao
cluster: dev-gcp
- application: azure-token-generator
namespace: aura
cluster: dev-gcp
envFrom:
- configmap: pto-config
env:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<version>1.7.0</version>
<version>1.8.0</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
Expand Down

0 comments on commit 7badb67

Please sign in to comment.