Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into oppdater-avhengigheter
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
  • Loading branch information
olekvernberg committed Sep 11, 2023
2 parents 32e93d9 + 1b9d407 commit 666a6ca
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: Build and sonar
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false
fetch-depth: 0 # brukes for å unngå feil i differ i sonar
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: Build, push and deploy to dev-gcp
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false
- name: Set up JDK 17
Expand All @@ -36,7 +36,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: nais/deploy/actions/deploy@v1
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Build, push and deploy to dev-gcp and prod-gcp
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false
- name: Set up JDK 17
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Deploy til dev-gcp
uses: nais/deploy/actions/deploy@v1
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-deploy-kafka-topic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: deploy behandlingsstatistikk to dev
uses: nais/deploy/actions/deploy@v1
env:
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.2</version>
<version>3.1.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<repositories>
Expand All @@ -29,7 +29,7 @@
<sha1/>
<changelist>-SNAPSHOT</changelist>
<java.version>17</java.version>
<kotlin.version>1.9.0</kotlin.version>
<kotlin.version>1.9.10</kotlin.version>
<springdoc.version>2.2.0</springdoc.version>
<mockk-jvm.version>1.13.7</mockk-jvm.version>
<felles.version>2.20230905101454_06fa3d7</felles.version>
Expand Down Expand Up @@ -212,7 +212,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<version>1.18.3</version>
<version>1.19.0</version>
<scope>test</scope>
</dependency>

Expand Down

0 comments on commit 666a6ca

Please sign in to comment.