Skip to content

Commit

Permalink
Felles 4.4.0 fix
Browse files Browse the repository at this point in the history
  • Loading branch information
mrsladek committed Jul 5, 2023
1 parent 0bca5b1 commit 6b0712c
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 11 deletions.
37 changes: 26 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,16 @@
<sonar.projectName>fp-prosesstask</sonar.projectName>
<sonar.projectKey>navikt_fp-prosesstask</sonar.projectKey>

<felles.version>4.3.1</felles.version>
<felles.version>4.4.0</felles.version>

<jakarta.persistence.version>2.2.3</jakarta.persistence.version>

<maven.deploy.skip>false</maven.deploy.skip>
</properties>

<jakarta.jakartaee-bom.version>8.0.0</jakarta.jakartaee-bom.version>

<hibernate-core.version>5.6.15.Final</hibernate-core.version>
</properties>

<repositories>
<repository>
Expand Down Expand Up @@ -90,7 +94,7 @@
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-bom</artifactId>
<version>8.0.0</version>
<version>${jakarta.jakartaee-bom.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down Expand Up @@ -157,6 +161,17 @@
<type>pom</type>
</dependency>

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate-core.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-micrometer</artifactId>
<version>${hibernate-core.version}</version>
</dependency>

<!-- JAXB BOM-->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
Expand Down Expand Up @@ -244,7 +259,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.3.8</version>
<version>1.4.8</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down Expand Up @@ -413,9 +428,9 @@
</plugin>

<plugin>
<groupId>org.jboss.jandex</groupId>
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<version>1.2.3</version>
<version>3.0.5</version>
<executions>
<execution>
<id>make-index</id>
Expand All @@ -435,10 +450,10 @@
</pluginManagement>

<plugins>
<plugin>
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
</plugin>
<!-- <plugin>-->
<!-- <groupId>io.smallrye</groupId>-->
<!-- <artifactId>jandex-maven-plugin</artifactId>-->
<!-- </plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand Down Expand Up @@ -497,7 +512,7 @@
<dependency>
<groupId>no.nav.k9.dev</groupId>
<artifactId>dev-jakarta-transform</artifactId>
<version>0.6.10</version>
<version>0.6.11</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
Expand Down
11 changes: 11 additions & 0 deletions task/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,17 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-micrometer</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down

0 comments on commit 6b0712c

Please sign in to comment.