Merge branch 'master' into POFIM-102-verdikjedetst-for-inntektsmelding

navikt · Dec 18, 2024 · cc593a4 · cc593a4
2 parents 8c3b9f0 + a40c06c
commit cc593a4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/mocks/fager-mock/src/main/java/no/nav/fager/FagerMock.java b/mocks/fager-mock/src/main/java/no/nav/fager/FagerMock.java
@@ -92,6 +92,9 @@ public Map<String, Object> graphQLRequest(@HeaderParam(AUTHORIZATION) String aut
             LOG.info("FAGER: hardDeleteSak operation");
             var executionResult = graphqlTjeneste.sak(request);
             return executionResult.toSpecification();
+        } else if ("oppgaveUtgaatt".equals(operationName)) {
+            LOG.info("FAGER: oppgaveUtgaat operation");
+            return Collections.emptyMap();
         }
         throw new NotImplementedException("Operasjon er ikke implementert :" + operationName);
     }

diff --git a/mocks/journalpost-mock/src/main/java/no/nav/dokarkiv/JournalpostMapper.java b/mocks/journalpost-mock/src/main/java/no/nav/dokarkiv/JournalpostMapper.java
@@ -56,7 +56,7 @@ public JournalpostModell tilModell(OpprettJournalpostRequest journalpostRequest)
     }
 
     private boolean erKnyttetTilSak(Sak sak) {
-        return sak != null & sak.getFagsakId() != null;
+        return sak != null && sak.getFagsakId() != null;
     }
 
     private List<DokumentModell> tilDokumentModeller(List<Dokument> dokumenter) {

diff --git a/model/src/main/java/no/nav/foreldrepenger/vtp/testmodell/ansatt/NAVAnsatt.java b/model/src/main/java/no/nav/foreldrepenger/vtp/testmodell/ansatt/NAVAnsatt.java
diff --git a/pom.xml b/pom.xml
@@ -42,7 +42,7 @@
         <sonar.projectKey>navikt_vtp</sonar.projectKey>
 
         <!--    Interne avhengigheter    -->
-        <fp-kontrakter.version>9.1.22</fp-kontrakter.version>
+        <fp-kontrakter.version>9.2.1</fp-kontrakter.version>
 
         <!--    Eksterne avhengigheter    -->
         <swagger-codegen-maven-plugin.version>3.0.64</swagger-codegen-maven-plugin.version> <!-- > 3.0.41 har bug med slf4.. -->
@@ -54,11 +54,11 @@
         <!-- Java Enterprise -->
         <jakarta.jakartaee-bom.version>10.0.0</jakarta.jakartaee-bom.version>
         <logstash.version>8.0</logstash.version>
-        <jetty.version>12.0.15</jetty.version>
+        <jetty.version>12.0.16</jetty.version>
         <jersey.version>3.1.9</jersey.version>
         <slf4j.version>2.0.16</slf4j.version>
         <logback.version>1.5.12</logback.version>
-        <swagger.version>2.2.26</swagger.version>
+        <swagger.version>2.2.27</swagger.version>
         <mockito.version>5.14.2</mockito.version>
     </properties>
 
@@ -89,7 +89,7 @@
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
-                <version>2.18.1</version>
+                <version>2.18.2</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -184,7 +184,7 @@
             <dependency>
                 <groupId>io.confluent</groupId>
                 <artifactId>kafka-avro-serializer</artifactId>
-                <version>7.7.1</version>
+                <version>7.8.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.zookeeper</groupId>
@@ -206,7 +206,7 @@
             <dependency>
                 <groupId>com.unboundid</groupId>
                 <artifactId>unboundid-ldapsdk</artifactId>
-                <version>7.0.1</version>
+                <version>7.0.2</version>
             </dependency>
 
             <dependency>
@@ -424,7 +424,7 @@
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
-            <version>1.15.10</version>
+            <version>1.15.11</version>
         </dependency>
 
         <!--    TEST    -->