Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into hent-data-til-gjenbruk
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
  • Loading branch information
olekvernberg committed Nov 13, 2023
2 parents d4832d2 + 15a0916 commit 48b9181
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<fasterxml.version>2.15.3</fasterxml.version>
<felles.version>2.20231023162434_fa320ce</felles.version>
<kontrakter.version>3.0_20231101161029_4d64011</kontrakter.version>
<kontrakter.version>3.0_20231109091547_fd2cae7</kontrakter.version>
<start-class>no.nav.familie.ef.søknad.ApplicationKt</start-class>
<!--suppress UnresolvedMavenProperty Ligger som secret i github-->
<sonar.projectKey>${SONAR_PROJECTKEY}</sonar.projectKey>
Expand Down Expand Up @@ -322,7 +322,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.1</version>
<version>3.2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down

0 comments on commit 48b9181

Please sign in to comment.