From b0995a66e8eb6945c8c7344371be76bacc25a07c Mon Sep 17 00:00:00 2001 From: JeremiahUy Date: Tue, 16 Apr 2024 14:46:16 +0200 Subject: [PATCH 01/16] UPDATE: default tab value --- apps/frontend/src/pages/ProductAreaPage.tsx | 2 +- apps/frontend/src/pages/SystemPage.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/frontend/src/pages/ProductAreaPage.tsx b/apps/frontend/src/pages/ProductAreaPage.tsx index 4308beb2c..569897cea 100644 --- a/apps/frontend/src/pages/ProductAreaPage.tsx +++ b/apps/frontend/src/pages/ProductAreaPage.tsx @@ -37,7 +37,7 @@ export const ProductAreaPage = () => { <> - + diff --git a/apps/frontend/src/pages/SystemPage.tsx b/apps/frontend/src/pages/SystemPage.tsx index 302d48fe3..4a8853b8f 100644 --- a/apps/frontend/src/pages/SystemPage.tsx +++ b/apps/frontend/src/pages/SystemPage.tsx @@ -20,7 +20,7 @@ export const SystemPage = () => { <> - + From 0eca03382afe281a871ee052455543aec9282b2e Mon Sep 17 00:00:00 2001 From: Lord Andre Groseth Date: Wed, 17 Apr 2024 12:11:21 +0200 Subject: [PATCH 02/16] FIX: dependency convergence error --- apps/backend/pom.xml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/apps/backend/pom.xml b/apps/backend/pom.xml index 817c6dd16..6eabad3d9 100644 --- a/apps/backend/pom.xml +++ b/apps/backend/pom.xml @@ -30,7 +30,7 @@ 11.4.11 2.38.2 - 6.5.1 + 6.6.0 1.15.0 @@ -102,6 +102,32 @@ com.microsoft.graph microsoft-graph ${microsoft-graph.version} + + + com.microsoft.kiota + microsoft-kiota-serialization-json + + + com.microsoft.kiota + microsoft-kiota-serialization-form + + + com.microsoft.kiota + microsoft-kiota-serialization-multipart + + + com.microsoft.kiota + microsoft-kiota-serialization-text + + + com.microsoft.kiota + microsoft-kiota-authentication-azure + + + com.microsoft.kiota + microsoft-kiota-http-okHttp + + com.microsoft.azure From 735e82289d1ca0c76d36c790e42b1ff4b3808d9c Mon Sep 17 00:00:00 2001 From: Lord Andre Groseth Date: Fri, 19 Apr 2024 09:36:59 +0200 Subject: [PATCH 03/16] UPDATE: hibernate version --- apps/backend/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/backend/pom.xml b/apps/backend/pom.xml index 6eabad3d9..323a423e1 100644 --- a/apps/backend/pom.xml +++ b/apps/backend/pom.xml @@ -23,7 +23,7 @@ 17 no.nav.data.AppStarter - 3.7.3 + 3.7.4 2.5.0 0.16.0 7.4 From 80821e55766165389fb08038275a267e6ceb3a3c Mon Sep 17 00:00:00 2001 From: Lord Andre Groseth Date: Fri, 19 Apr 2024 10:05:32 +0200 Subject: [PATCH 04/16] UPDATE: spring-boot-starter-parent --- apps/backend/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/backend/pom.xml b/apps/backend/pom.xml index 6eabad3d9..7e1665716 100644 --- a/apps/backend/pom.xml +++ b/apps/backend/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.4 + 3.2.5 no.nav.data From 79ffc29deba8cfefb91f5a044952dd291f454082 Mon Sep 17 00:00:00 2001 From: JeremiahUy Date: Wed, 24 Apr 2024 12:19:16 +0200 Subject: [PATCH 05/16] UPDATE: kodeverk api url --- apps/backend/nais/backend-gcp.yaml | 2 +- .../behandlingskatalog-configmap-dev-gcp.yaml | 2 +- ...behandlingskatalog-configmap-prod-gcp.yaml | 2 +- apps/backend/pom.xml | 28 +------------------ 4 files changed, 4 insertions(+), 30 deletions(-) diff --git a/apps/backend/nais/backend-gcp.yaml b/apps/backend/nais/backend-gcp.yaml index 46b48ee08..6c6b429da 100644 --- a/apps/backend/nais/backend-gcp.yaml +++ b/apps/backend/nais/backend-gcp.yaml @@ -80,7 +80,7 @@ spec: external: - host: {{teamcat_ingress}} - host: {{termcat_ingress}} - - host: kodeverk.nais.adeo.no + - host: kodeverk-api.nav.no - host: slack.com envFrom: - configmap: behandlingskatalogcfg diff --git a/apps/backend/nais/behandlingskatalog-configmap-dev-gcp.yaml b/apps/backend/nais/behandlingskatalog-configmap-dev-gcp.yaml index 7513627c2..184c23550 100644 --- a/apps/backend/nais/behandlingskatalog-configmap-dev-gcp.yaml +++ b/apps/backend/nais/behandlingskatalog-configmap-dev-gcp.yaml @@ -8,7 +8,7 @@ data: BIGQUERY_AAREG_DATASETNAME: aareg_avtaler BIGQUERY_AAREG_PROJECTID: teamcrm-prod-31a7 BIGQUERY_AAREG_TABLENAME: aareg_avtaler_for_tilgang - CLIENT_COMMON_CODE_NAV_URL: https://kodeverk.dev-fss-pub.nais.io/api + CLIENT_COMMON_CODE_NAV_URL: https://kodeverk-api.nav.no/api CLIENT_TEAMCAT_URL: https://teamkatalog-api.intern.dev.nav.no CLIENT_TERM_CATALOG_URL: https://begrepskatalog-api.intern.dev.nav.no/api/dcat ENVIRONMENT_CLASS: preprod diff --git a/apps/backend/nais/behandlingskatalog-configmap-prod-gcp.yaml b/apps/backend/nais/behandlingskatalog-configmap-prod-gcp.yaml index 64b3cf318..b1fcffc3b 100644 --- a/apps/backend/nais/behandlingskatalog-configmap-prod-gcp.yaml +++ b/apps/backend/nais/behandlingskatalog-configmap-prod-gcp.yaml @@ -8,7 +8,7 @@ data: BIGQUERY_AAREG_DATASETNAME: aareg_avtaler BIGQUERY_AAREG_PROJECTID: teamcrm-prod-31a7 BIGQUERY_AAREG_TABLENAME: aareg_avtaler_for_tilgang - CLIENT_COMMON_CODE_NAV_URL: https://kodeverk.prod-fss-pub.nais.io/api + CLIENT_COMMON_CODE_NAV_URL: https://kodeverk-api.nav.no/api CLIENT_TEAMCAT_URL: https://teamkatalog-api.intern.nav.no CLIENT_TERM_CATALOG_URL: https://begrepskatalog-api.intern.nav.no/api/dcat ENVIRONMENT_CLASS: prod diff --git a/apps/backend/pom.xml b/apps/backend/pom.xml index d0d46d96b..7aaf2159a 100644 --- a/apps/backend/pom.xml +++ b/apps/backend/pom.xml @@ -30,7 +30,7 @@ 11.4.11 2.38.2 - 6.6.0 + 6.5.1 1.15.0 @@ -102,32 +102,6 @@ com.microsoft.graph microsoft-graph ${microsoft-graph.version} - - - com.microsoft.kiota - microsoft-kiota-serialization-json - - - com.microsoft.kiota - microsoft-kiota-serialization-form - - - com.microsoft.kiota - microsoft-kiota-serialization-multipart - - - com.microsoft.kiota - microsoft-kiota-serialization-text - - - com.microsoft.kiota - microsoft-kiota-authentication-azure - - - com.microsoft.kiota - microsoft-kiota-http-okHttp - - com.microsoft.azure From eaf21c96f4e86376698dd82c715e0999500acdb6 Mon Sep 17 00:00:00 2001 From: Lord Andre Groseth Date: Fri, 26 Apr 2024 09:32:23 +0200 Subject: [PATCH 06/16] UPDATE: microsoft-graph.version --- apps/backend/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/backend/pom.xml b/apps/backend/pom.xml index 7aaf2159a..9ff9452f8 100644 --- a/apps/backend/pom.xml +++ b/apps/backend/pom.xml @@ -30,7 +30,7 @@ 11.4.11 2.38.2 - 6.5.1 + 6.7.0 1.15.0 From 27d5708cb5974d412ebcb5ff10838445dbdac57a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 04:44:57 +0000 Subject: [PATCH 07/16] Bump io.hypersistence:hypersistence-utils-hibernate-63 in /apps/backend Bumps [io.hypersistence:hypersistence-utils-hibernate-63](https://github.com/vladmihalcea/hypersistence-utils) from 3.7.4 to 3.7.5. - [Changelog](https://github.com/vladmihalcea/hypersistence-utils/blob/master/changelog.txt) - [Commits](https://github.com/vladmihalcea/hypersistence-utils/compare/hypersistence-utils-parent-3.7.4...hypersistence-utils-parent-3.7.5) --- updated-dependencies: - dependency-name: io.hypersistence:hypersistence-utils-hibernate-63 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- apps/backend/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/backend/pom.xml b/apps/backend/pom.xml index 9ff9452f8..1952e2ea9 100644 --- a/apps/backend/pom.xml +++ b/apps/backend/pom.xml @@ -23,7 +23,7 @@ 17 no.nav.data.AppStarter - 3.7.4 + 3.7.5 2.5.0 0.16.0 7.4 From f6f320f69a481d3e69dbdc6ec3a72f1b8bc41c84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 04:43:19 +0000 Subject: [PATCH 08/16] Bump com.google.cloud:libraries-bom in /apps/backend Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.37.0 to 26.38.0. - [Release notes](https://github.com/googleapis/java-cloud-bom/releases) - [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json) - [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.37.0...v26.38.0) --- updated-dependencies: - dependency-name: com.google.cloud:libraries-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- apps/backend/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/backend/pom.xml b/apps/backend/pom.xml index 9ff9452f8..8b6f83b1a 100644 --- a/apps/backend/pom.xml +++ b/apps/backend/pom.xml @@ -94,7 +94,7 @@ com.google.cloud libraries-bom - 26.37.0 + 26.38.0 pom import From 9ed222b808f397ede6761aaa1be66ce8392289c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 04:55:20 +0000 Subject: [PATCH 09/16] Bump com.google.guava:guava in /apps/backend Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.1.0-jre to 33.2.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- apps/backend/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/backend/pom.xml b/apps/backend/pom.xml index d355c2bd4..911d71c11 100644 --- a/apps/backend/pom.xml +++ b/apps/backend/pom.xml @@ -36,7 +36,7 @@ 1.26.1 2.16.1 - 33.1.0-jre + 33.2.0-jre 5.14.0 24.1.0 4.2.2 From 8f5238e9a33c344a2d68c8812dc712fca8c5a326 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 04:47:39 +0000 Subject: [PATCH 10/16] Bump com.google.cloud:libraries-bom in /apps/backend Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.38.0 to 26.39.0. - [Release notes](https://github.com/googleapis/java-cloud-bom/releases) - [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json) - [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.38.0...v26.39.0) --- updated-dependencies: - dependency-name: com.google.cloud:libraries-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- apps/backend/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/backend/pom.xml b/apps/backend/pom.xml index 911d71c11..a2a21982b 100644 --- a/apps/backend/pom.xml +++ b/apps/backend/pom.xml @@ -94,7 +94,7 @@ com.google.cloud libraries-bom - 26.38.0 + 26.39.0 pom import From f1c9ce4bdb2a01c4c7c8d5d50c04df83682d5c51 Mon Sep 17 00:00:00 2001 From: Lord Andre Groseth Date: Fri, 10 May 2024 09:27:02 +0200 Subject: [PATCH 11/16] UPDATE: microsoft-graph.version --- apps/backend/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/backend/pom.xml b/apps/backend/pom.xml index a2a21982b..219ef378f 100644 --- a/apps/backend/pom.xml +++ b/apps/backend/pom.xml @@ -30,7 +30,7 @@ 11.4.11 2.38.2 - 6.7.0 + 6.9.0 1.15.0 From 42bbf76529cfb339d13673d4803ce11118d5c657 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 04:13:47 +0000 Subject: [PATCH 12/16] --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- apps/frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/frontend/package.json b/apps/frontend/package.json index 9c468f766..13b1c6efb 100644 --- a/apps/frontend/package.json +++ b/apps/frontend/package.json @@ -11,7 +11,7 @@ "@navikt/ds-react": "^6.0.0", "@navikt/ds-tailwind": "^6.0.0", "amplitude-js": "^8.0.0", - "axios": "1.6.8", + "axios": "1.7.1", "baseui": "^13.0.0", "core-js": "^3.7.0", "flag-icon-css": "^4.1.6", From 803c2995a98272b6df9b3c557233718995413282 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 04:52:27 +0000 Subject: [PATCH 13/16] --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- apps/frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/frontend/package.json b/apps/frontend/package.json index 13b1c6efb..985550efb 100644 --- a/apps/frontend/package.json +++ b/apps/frontend/package.json @@ -11,7 +11,7 @@ "@navikt/ds-react": "^6.0.0", "@navikt/ds-tailwind": "^6.0.0", "amplitude-js": "^8.0.0", - "axios": "1.7.1", + "axios": "1.7.2", "baseui": "^13.0.0", "core-js": "^3.7.0", "flag-icon-css": "^4.1.6", From c236e7a93571cefa3b5145f0b88ccee03ca4a3a9 Mon Sep 17 00:00:00 2001 From: Lord Andre Groseth Date: Thu, 23 May 2024 14:27:58 +0200 Subject: [PATCH 14/16] UPDATE: microsoft-graph.version --- apps/backend/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/backend/pom.xml b/apps/backend/pom.xml index 219ef378f..bc0ebc17f 100644 --- a/apps/backend/pom.xml +++ b/apps/backend/pom.xml @@ -30,7 +30,7 @@ 11.4.11 2.38.2 - 6.9.0 + 6.10.0 1.15.0 From 244b6fca3ac88a57402431d7b310cefca0ad8ff4 Mon Sep 17 00:00:00 2001 From: Lord Andre Groseth Date: Fri, 24 May 2024 10:22:32 +0200 Subject: [PATCH 15/16] UPDATE: commons-compress.version --- apps/backend/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/backend/pom.xml b/apps/backend/pom.xml index bc0ebc17f..66a4e18d5 100644 --- a/apps/backend/pom.xml +++ b/apps/backend/pom.xml @@ -34,7 +34,7 @@ 1.15.0 - 1.26.1 + 1.26.2 2.16.1 33.2.0-jre 5.14.0 From c9d7148f66f0857800c0fe57d414416e010e337d Mon Sep 17 00:00:00 2001 From: Lord Andre Groseth Date: Fri, 24 May 2024 10:48:42 +0200 Subject: [PATCH 16/16] UPDATE: microsoft-graph.version --- apps/backend/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/backend/pom.xml b/apps/backend/pom.xml index 66a4e18d5..88eade5d5 100644 --- a/apps/backend/pom.xml +++ b/apps/backend/pom.xml @@ -30,7 +30,7 @@ 11.4.11 2.38.2 - 6.10.0 + 6.11.0 1.15.0