Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Synce master med dev #148

Merged
merged 8 commits into from
Apr 3, 2024
Merged

Synce master med dev #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
770bedf
Bump common.version (#126)
dependabot[bot] Mar 22, 2024
47eab7a
Bump no.bekk.bekkopen:nocommons from 0.15.0 to 0.16.0 (#129)
dependabot[bot] Mar 22, 2024
fd7228c
Bump com.zaxxer:HikariCP from 5.0.1 to 5.1.0 (#130)
dependabot[bot] Mar 22, 2024
55d77cc
Bump com.github.navikt.poao-tilgang:client (#139)
dependabot[bot] Mar 22, 2024
dd7ba5a
Bump org.testcontainers:postgresql from 1.17.6 to 1.19.7 (#140)
dependabot[bot] Mar 22, 2024
87e3f7f
Merge branch 'master' into dev
klaramargrethehelgemo Mar 22, 2024
f0abf27
TC-579 Gi token-generator tilgang i dev
slovrid Apr 3, 2024
7a68985
Merge pull request #147 from navikt/token-generator
slovrid Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .nais/application/application-config-dev.yaml
View file
Open in desktop
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
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<properties>
<java.version>17</java.version>
<common.version>3.2023.04.11_09.05-411b59915166</common.version>
<common.version>3.2023.10.23_12.41-bafec3836d28</common.version>
</properties>

<build>
Expand Down Expand Up @@ -61,7 +61,7 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>5.0.1</version>
<version>5.1.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -155,7 +155,7 @@
<dependency>
<groupId>no.bekk.bekkopen</groupId>
<artifactId>nocommons</artifactId>
<version>0.15.0</version>
<version>0.16.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -167,7 +167,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<version>1.17.6</version>
<version>1.19.7</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -195,7 +195,7 @@
<dependency>
<groupId>com.github.navikt.poao-tilgang</groupId>
<artifactId>client</artifactId>
<version>2023.03.15_13.26-d286fc9239c3</version>
<version>2024.02.20_07.34-4dbbf67d478e</version>
</dependency>
</dependencies>
<repositories>
Expand Down