Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
Java 21 og smallrye/jandex (#113)
Browse files Browse the repository at this point in the history
* Java 21 og smallrye/jandex

* Revert ti jboss jandex

* Smallrye v10

* Fikser jandex version

---------

Co-authored-by: Michal J. Sladek <[email protected]>
  • Loading branch information
jolarsen and mrsladek authored Nov 17, 2023
1 parent 267f942 commit 8cb46e7
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .java-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17
21.0
25 changes: 14 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@

<groupId>no.nav.foreldrepenger</groupId>
<artifactId>konfig</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.1-SNAPSHOT</version>

<properties>
<java.version>17</java.version>
<java.version>21</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<argLine>-Xms256m -Dlog.level.no.nav=INFO -Dfile.encoding=${project.build.sourceEncoding}</argLine>

<junit.version>5.10.0</junit.version>
<junit.version>5.10.1</junit.version>

<!-- Sonar felles -->
<sonar.organization>navikt</sonar.organization>
Expand All @@ -42,7 +42,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.7</version>
<version>2.0.9</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down Expand Up @@ -85,7 +85,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -129,7 +129,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.2</version>
<configuration>
<!-- Må ha @{argLine} ellers blir properties satt av jacoco-maven-plugin overkrevet -->
<argLine>@{argLine} ${argLine}</argLine>
Expand All @@ -144,7 +144,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.10</version>
<version>0.8.11</version>
<configuration>
<excludes>
<exclude>**/*no/nav*/**Test.class</exclude>
Expand Down Expand Up @@ -175,9 +175,9 @@
</executions>
</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 @@ -186,6 +186,9 @@
</goals>
</execution>
</executions>
<configuration>
<indexVersion>10</indexVersion>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -215,14 +218,14 @@
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>3.9.1.2184</version>
<version>3.10.0.2594</version>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.jboss.jandex</groupId>
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
</plugin>
<plugin>
Expand Down
6 changes: 0 additions & 6 deletions src/test/resources/META-INF/beans.xml

This file was deleted.

0 comments on commit 8cb46e7

Please sign in to comment.