From a4336cb327e1d9b854b9fa200a83791741683d6d Mon Sep 17 00:00:00 2001 From: Klara M Helgemo Date: Fri, 22 Mar 2024 15:04:17 +0100 Subject: [PATCH 1/3] Prodsette dependabots common, bekkopen, HikariCP, poao-tilgang, testcontainers (#141) * Bump common.version (#126) Bumps `common.version` from 3.2023.04.11_09.05-411b59915166 to 3.2023.10.23_12.41-bafec3836d28. Updates `com.github.navikt.common-java-modules:util` from 3.2023.04.11_09.05-411b59915166 to 3.2023.10.23_12.41-bafec3836d28 - [Release notes](https://github.com/navikt/common-java-modules/releases) - [Commits](https://github.com/navikt/common-java-modules/commits) Updates `com.github.navikt.common-java-modules:types` from 3.2023.04.11_09.05-411b59915166 to 3.2023.10.23_12.41-bafec3836d28 - [Release notes](https://github.com/navikt/common-java-modules/releases) - [Commits](https://github.com/navikt/common-java-modules/commits) Updates `com.github.navikt.common-java-modules:client` from 3.2023.04.11_09.05-411b59915166 to 3.2023.10.23_12.41-bafec3836d28 - [Release notes](https://github.com/navikt/common-java-modules/releases) - [Commits](https://github.com/navikt/common-java-modules/commits) Updates `com.github.navikt.common-java-modules:token-client` from 3.2023.04.11_09.05-411b59915166 to 3.2023.10.23_12.41-bafec3836d28 - [Release notes](https://github.com/navikt/common-java-modules/releases) - [Commits](https://github.com/navikt/common-java-modules/commits) Updates `com.github.navikt.common-java-modules:auth` from 3.2023.04.11_09.05-411b59915166 to 3.2023.10.23_12.41-bafec3836d28 - [Release notes](https://github.com/navikt/common-java-modules/releases) - [Commits](https://github.com/navikt/common-java-modules/commits) Updates `com.github.navikt.common-java-modules:log` from 3.2023.04.11_09.05-411b59915166 to 3.2023.10.23_12.41-bafec3836d28 - [Release notes](https://github.com/navikt/common-java-modules/releases) - [Commits](https://github.com/navikt/common-java-modules/commits) Updates `com.github.navikt.common-java-modules:health` from 3.2023.04.11_09.05-411b59915166 to 3.2023.10.23_12.41-bafec3836d28 - [Release notes](https://github.com/navikt/common-java-modules/releases) - [Commits](https://github.com/navikt/common-java-modules/commits) Updates `com.github.navikt.common-java-modules:metrics` from 3.2023.04.11_09.05-411b59915166 to 3.2023.10.23_12.41-bafec3836d28 - [Release notes](https://github.com/navikt/common-java-modules/releases) - [Commits](https://github.com/navikt/common-java-modules/commits) Updates `com.github.navikt.common-java-modules:test` from 3.2023.04.11_09.05-411b59915166 to 3.2023.10.23_12.41-bafec3836d28 - [Release notes](https://github.com/navikt/common-java-modules/releases) - [Commits](https://github.com/navikt/common-java-modules/commits) --- updated-dependencies: - dependency-name: com.github.navikt.common-java-modules:util dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.github.navikt.common-java-modules:types dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.github.navikt.common-java-modules:client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.github.navikt.common-java-modules:token-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.github.navikt.common-java-modules:auth dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.github.navikt.common-java-modules:log dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.github.navikt.common-java-modules:health dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.github.navikt.common-java-modules:metrics dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.github.navikt.common-java-modules:test dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump no.bekk.bekkopen:nocommons from 0.15.0 to 0.16.0 (#129) Bumps [no.bekk.bekkopen:nocommons](https://github.com/bekkopen/NoCommons) from 0.15.0 to 0.16.0. - [Release notes](https://github.com/bekkopen/NoCommons/releases) - [Commits](https://github.com/bekkopen/NoCommons/compare/0.15.0...0.16.0) --- updated-dependencies: - dependency-name: no.bekk.bekkopen:nocommons dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump com.zaxxer:HikariCP from 5.0.1 to 5.1.0 (#130) Bumps [com.zaxxer:HikariCP](https://github.com/brettwooldridge/HikariCP) from 5.0.1 to 5.1.0. - [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES) - [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-5.0.1...HikariCP-5.1.0) --- updated-dependencies: - dependency-name: com.zaxxer:HikariCP dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump com.github.navikt.poao-tilgang:client (#139) Bumps com.github.navikt.poao-tilgang:client from 2023.03.15_13.26-d286fc9239c3 to 2024.02.20_07.34-4dbbf67d478e. --- updated-dependencies: - dependency-name: com.github.navikt.poao-tilgang:client dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.testcontainers:postgresql from 1.17.6 to 1.19.7 (#140) Bumps [org.testcontainers:postgresql](https://github.com/testcontainers/testcontainers-java) from 1.17.6 to 1.19.7. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.19.7) --- updated-dependencies: - dependency-name: org.testcontainers:postgresql dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index a62d749..25648a2 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 17 - 3.2023.04.11_09.05-411b59915166 + 3.2023.10.23_12.41-bafec3836d28 @@ -61,7 +61,7 @@ com.zaxxer HikariCP - 5.0.1 + 5.1.0 @@ -155,7 +155,7 @@ no.bekk.bekkopen nocommons - 0.15.0 + 0.16.0 test @@ -167,7 +167,7 @@ org.testcontainers postgresql - 1.17.6 + 1.19.7 test @@ -195,7 +195,7 @@ com.github.navikt.poao-tilgang client - 2023.03.15_13.26-d286fc9239c3 + 2024.02.20_07.34-4dbbf67d478e From c2942cb1a1a91d066f296725d7d281ce669394fe Mon Sep 17 00:00:00 2001 From: Sondre Larsen Ovrid <111113539+slovrid@users.noreply.github.com> Date: Mon, 13 May 2024 10:05:55 +0200 Subject: [PATCH 2/3] Synce master med dev (#152) * Bump org.springdoc:springdoc-openapi-ui from 1.7.0 to 1.8.0 (#144) Bumps org.springdoc:springdoc-openapi-ui from 1.7.0 to 1.8.0. --- updated-dependencies: - dependency-name: org.springdoc:springdoc-openapi-ui dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0 (#145) * Bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0 Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.11.0 to 4.12.0. - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/okhttp/compare/parent-4.11.0...parent-4.12.0) --- updated-dependencies: - dependency-name: com.squareup.okhttp3:okhttp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * oppdatering prometheus --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Klara M Helgemo * Bump softprops/action-gh-release from 1 to 2 in /.github/workflows (#146) Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2. - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Klara M Helgemo * Legg til generativ KI merking --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Klara M Helgemo --- .github/workflows/main.yml | 2 +- README.md | 4 ++++ pom.xml | 4 ++-- src/main/resources/application-local.properties | 2 +- src/main/resources/application.properties | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b517ab9..3ab6aaa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -87,7 +87,7 @@ jobs: VAR: image=${{ needs.test-build-and-push.outputs.image }} - name: Create release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: name: Release to prod target_commitish: master diff --git a/README.md b/README.md index 0df2a5e..32608c9 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,7 @@ Spørsmål knyttet til koden eller prosjektet kan stilles ved å opprette en iss ## For NAV-ansatte Interne henvendelser kan sendes via Slack i kanalen #po-arbeidsoppfølging. + +## Kode generert av GitHub Copilot + +Dette repoet bruker GitHub Copilot til å generere kode. diff --git a/pom.xml b/pom.xml index 25648a2..dc8c246 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ org.springdoc springdoc-openapi-ui - 1.7.0 + 1.8.0 com.zaxxer @@ -67,7 +67,7 @@ com.squareup.okhttp3 okhttp - 4.11.0 + 4.12.0 diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index b9c2a43..b030811 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -4,7 +4,7 @@ management.endpoint.metrics.enabled=true management.endpoints.web.base-path=/internal management.endpoints.web.exposure.include=* management.endpoint.prometheus.enabled=true -management.metrics.export.prometheus.enabled=true +management.prometheus.metrics.export.enabled=true # Vi migrerer databasen med flyway manuelt spring.flyway.enabled=false diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 83faa6e..257c120 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -5,8 +5,8 @@ management.endpoint.metrics.enabled=true management.endpoints.web.base-path=/internal management.endpoints.web.exposure.include=prometheus,health management.endpoint.prometheus.enabled=true -management.metrics.export.prometheus.enabled=true -management.health.probes.enabled=true +management.prometheus.metrics.export.enabled=true +management.endpoint.health.probes.enabled=true management.endpoint.health.group.liveness.include=livenessState # Vi migrerer databasen med flyway manuelt From a0f1c353db1a13b5f77bb99a916cccdc06ec9a52 Mon Sep 17 00:00:00 2001 From: Klara M Helgemo Date: Mon, 13 May 2024 12:32:01 +0200 Subject: [PATCH 3/3] Prodsette oppgradering Java 21 (#154) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bump org.springdoc:springdoc-openapi-ui from 1.7.0 to 1.8.0 (#144) Bumps org.springdoc:springdoc-openapi-ui from 1.7.0 to 1.8.0. --- updated-dependencies: - dependency-name: org.springdoc:springdoc-openapi-ui dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0 (#145) * Bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0 Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.11.0 to 4.12.0. - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/okhttp/compare/parent-4.11.0...parent-4.12.0) --- updated-dependencies: - dependency-name: com.squareup.okhttp3:okhttp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * oppdatering prometheus --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Klara M Helgemo * Bump softprops/action-gh-release from 1 to 2 in /.github/workflows (#146) Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2. - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Klara M Helgemo * Legg til generativ KI merking * Oppgrader til Java 21 (#153) --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sondre Larsen Ovrid <111113539+slovrid@users.noreply.github.com> Co-authored-by: Mathias S. Müller <85442404+Mathiamu@users.noreply.github.com> --- .github/workflows/codeql.yml | 2 +- .github/workflows/deploy-til-dev.yaml | 8 ++++---- .github/workflows/main.yml | 8 ++++---- Dockerfile | 2 +- pom.xml | 3 ++- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index cf4699e..1917d91 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -53,7 +53,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: temurin cache: maven diff --git a/.github/workflows/deploy-til-dev.yaml b/.github/workflows/deploy-til-dev.yaml index a471c55..c2cc341 100644 --- a/.github/workflows/deploy-til-dev.yaml +++ b/.github/workflows/deploy-til-dev.yaml @@ -19,10 +19,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up Java uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' cache: 'maven' - name: Run maven tests @@ -37,10 +37,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up Java uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' cache: 'maven' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ab6aaa..ed8e2af 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,10 +16,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up Java uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' cache: 'maven' @@ -36,10 +36,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up Java uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' cache: 'maven' diff --git a/Dockerfile b/Dockerfile index bc5ded0..13e1154 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,2 @@ -FROM ghcr.io/navikt/poao-baseimages/java:17 +FROM ghcr.io/navikt/baseimages/temurin:21 COPY /target/veilarboppgave.jar app.jar diff --git a/pom.xml b/pom.xml index dc8c246..94034d1 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ Backend applikasjon for oppgaver - 17 + 21 3.2023.10.23_12.41-bafec3836d28 @@ -79,6 +79,7 @@ org.projectlombok lombok + 1.18.32 true