Merge branch 'master' of https://github.com/navikt/polly into fjerne-…

…engelsk
navikt · May 27, 2024 · 8df4a61 · 8df4a61
2 parents 00b9a48 + c9d7148
commit 8df4a61
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
     </parent>
 
     <groupId>no.nav.data</groupId>
@@ -23,20 +23,20 @@
     <properties>
         <java.version>17</java.version>
         <start-class>no.nav.data.AppStarter</start-class>
-        <hypersistence-utils-hibernate-63.version>3.7.3</hypersistence-utils-hibernate-63.version>
+        <hypersistence-utils-hibernate-63.version>3.7.5</hypersistence-utils-hibernate-63.version>
         <springdoc-openapi-starter-webmvc-ui.version>2.5.0</springdoc-openapi-starter-webmvc-ui.version>
         <simpleclient.version>0.16.0</simpleclient.version>
         <logstash-logback-encoder.version>7.4</logstash-logback-encoder.version>
         <docx4j.version>11.4.11</docx4j.version>
         <google-cloud-bigquery.version>2.38.2</google-cloud-bigquery.version>
 
-        <microsoft-graph.version>6.5.1</microsoft-graph.version>
+        <microsoft-graph.version>6.11.0</microsoft-graph.version>
         <msal4j.version>1.15.0</msal4j.version>
 
         <!-- transitive versions -->
-        <commons-compress.version>1.26.1</commons-compress.version>
+        <commons-compress.version>1.26.2</commons-compress.version>
         <commons-io.version>2.16.1</commons-io.version>
-        <guava.version>33.1.0-jre</guava.version>
+        <guava.version>33.2.0-jre</guava.version>
         <jna.version>5.14.0</jna.version>
         <jetbrains.annotation.version>24.1.0</jetbrains.annotation.version>
         <stax2-api.version>4.2.2</stax2-api.version>
@@ -94,7 +94,7 @@
             <dependency>
                 <groupId>com.google.cloud</groupId>
                 <artifactId>libraries-bom</artifactId>
-                <version>26.37.0</version>
+                <version>26.39.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git 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.2",
     "baseui": "^13.0.0",
     "core-js": "^3.7.0",
     "flag-icon-css": "^4.1.6",

diff --git a/apps/frontend/src/pages/ProductAreaPage.tsx b/apps/frontend/src/pages/ProductAreaPage.tsx
@@ -36,7 +36,7 @@ export const ProductAreaPage = () => {
         <>
           <PageHeader section={Section.productarea} code={productAreaId} />
 
-          <Tabs>
+          <Tabs defaultValue="behandlinger">
             <Tabs.List>
               <Tabs.Tab value="behandlinger" label="Behandlinger" />
               <Tabs.Tab value="opplysningstyper" label="Opplysningstyper" />

diff --git a/apps/frontend/src/pages/SystemPage.tsx b/apps/frontend/src/pages/SystemPage.tsx
@@ -19,7 +19,7 @@ export const SystemPage = () => {
         <>
           <PageHeader section={Section.system} code={systemCode} />
 
-          <Tabs>
+          <Tabs defaultValue="behandlinger">
             <Tabs.List>
               <Tabs.Tab value="behandlinger" label="Behandlinger" />
               <Tabs.Tab value="opplysningstyper" label="opplysningstyper" />