Skip to content

Commit

Permalink
Merge branch 'master' into feature/flyway10
Browse files Browse the repository at this point in the history
  • Loading branch information
mrsladek authored Nov 17, 2023
2 parents 57470c1 + 1d35d0e commit 404af4f
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<sonar.projectName>fp-prosesstask</sonar.projectName>
<sonar.projectKey>navikt_fp-prosesstask</sonar.projectKey>

<felles.version>5.1.3</felles.version>
<felles.version>6.0.0</felles.version>

<jakarta.jakartaee-bom.version>9.1.0</jakarta.jakartaee-bom.version>
<hibernate-core.version>6.1.7.Final</hibernate-core.version>
Expand Down Expand Up @@ -219,11 +219,13 @@
<artifactId>HikariCP</artifactId>
<version>5.1.0</version>
</dependency>

<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-database-postgresql</artifactId>
<version>10.0.1</version>
</dependency>

<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
Expand Down Expand Up @@ -406,9 +408,9 @@
</plugin>

<plugin>
<groupId>org.jboss.jandex</groupId>
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<version>1.2.3</version>
<version>3.1.5</version>
<executions>
<execution>
<id>make-index</id>
Expand All @@ -417,6 +419,9 @@
</goals>
</execution>
</executions>
<configuration>
<indexVersion>10</indexVersion>
</configuration>
</plugin>

<plugin>
Expand All @@ -429,7 +434,7 @@

<plugins>
<plugin>
<groupId>org.jboss.jandex</groupId>
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
</plugin>
<plugin>
Expand Down

0 comments on commit 404af4f

Please sign in to comment.