Skip to content

Commit d067404

Browse files
authoredNov 17, 2023
Bytter til Java 21. Sanerer WS ting. Konfig flyttes til felles. (#528)
1 parent 41c87e0 commit d067404

File tree

4 files changed

+26
-51
lines changed

4 files changed

+26
-51
lines changed
 

‎.github/workflows/build.yml

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
uses: navikt/fp-gha-workflows/.github/actions/setup-java-and-maven@main
3030
with:
3131
github-token: ${{ secrets.GITHUB_TOKEN }}
32-
java-version: '17'
3332

3433
- name: Verify
3534
shell: bash

‎.java-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
17
1+
21.0

‎ee10/pom.xml

+18-18
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<version>3.0.0-SNAPSHOT</version>
1111

1212
<properties>
13-
<java.version>17</java.version>
13+
<java.version>21</java.version>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1616
<argLine>-Xms256m -Dlog.level.no.nav=WARN -Dfile.encoding=${project.build.sourceEncoding}</argLine>
@@ -24,7 +24,7 @@
2424
<!-- Java Enterprise -->
2525
<jakarta.jakartaee-bom.version>10.0.0</jakarta.jakartaee-bom.version>
2626

27-
<jetty.version>12.0.2</jetty.version>
27+
<jetty.version>12.0.3</jetty.version>
2828
<jersey.version>3.1.3</jersey.version>
2929

3030
<logback.version>1.4.11</logback.version>
@@ -33,26 +33,23 @@
3333

3434
<weld-core-bom.version>5.1.2.Final</weld-core-bom.version>
3535

36-
<jandex-maven-plugin.version>1.2.3</jandex-maven-plugin.version>
36+
<jandex-maven-plugin.version>3.1.5</jandex-maven-plugin.version>
3737
<jandex.version>2.4.4.Final</jandex.version>
3838

3939
<jaxb-bom.version>4.0.4</jaxb-bom.version>
4040

4141
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
4242
<hibernate.version>6.3.1.Final</hibernate.version>
4343

44-
<saaj-impl.version>3.0.3</saaj-impl.version>
45-
<xmlsec.version>4.0.0</xmlsec.version>
46-
4744
<jakarta.el.version>4.0.2</jakarta.el.version>
48-
<swagger.version>2.2.18</swagger.version>
45+
<swagger.version>2.2.19</swagger.version>
4946

5047
<!-- maven jakarta kompatible plugins -->
5148
<jaxb2-maven-plugin.version>3.1.0</jaxb2-maven-plugin.version>
5249

5350
<!-- Andre avhengigheter -->
5451
<prometheus.version>0.16.0</prometheus.version>
55-
<micrometer.version>1.11.5</micrometer.version>
52+
<micrometer.version>1.12.0</micrometer.version>
5653
<metrics.version>4.2.15</metrics.version>
5754

5855
<slf4j.version>2.0.9</slf4j.version>
@@ -61,13 +58,13 @@
6158

6259
<kafka.version>3.5.1</kafka.version>
6360

64-
<hikari.version>5.0.1</hikari.version>
61+
<hikari.version>5.1.0</hikari.version>
6562
<flyway.version>9.22.3</flyway.version>
6663
<postgresql.version>42.6.0</postgresql.version>
6764
<vault-jdbc.version>1.3.10</vault-jdbc.version>
6865

69-
<junit.version>5.10.0</junit.version>
70-
<mockito.version>5.6.0</mockito.version>
66+
<junit.version>5.10.1</junit.version>
67+
<mockito.version>5.7.0</mockito.version>
7168
<assertj.version>3.24.2</assertj.version>
7269

7370
<reflections.version>0.10.2</reflections.version>
@@ -368,13 +365,13 @@
368365
<dependency>
369366
<groupId>org.bouncycastle</groupId>
370367
<artifactId>bcprov-jdk18on</artifactId>
371-
<version>1.76</version>
368+
<version>1.77</version>
372369
</dependency>
373370
<!-- https://github.com/advisories/GHSA-hr8g-6v94-x4m9 -->
374371
<dependency>
375372
<groupId>org.bouncycastle</groupId>
376373
<artifactId>bcprov-jdk15to18</artifactId>
377-
<version>1.76</version>
374+
<version>1.77</version>
378375
</dependency>
379376
<!-- Fikser https://cwe.mitre.org/data/definitions/502.html -->
380377
<dependency>
@@ -516,7 +513,7 @@
516513
<version>3.1.0</version>
517514
</plugin>
518515
<plugin>
519-
<groupId>org.jboss.jandex</groupId>
516+
<groupId>io.smallrye</groupId>
520517
<artifactId>jandex-maven-plugin</artifactId>
521518
<version>${jandex-maven-plugin.version}</version>
522519
<executions>
@@ -527,6 +524,9 @@
527524
</goals>
528525
</execution>
529526
</executions>
527+
<configuration>
528+
<indexVersion>10</indexVersion>
529+
</configuration>
530530
</plugin>
531531
<plugin>
532532
<groupId>org.codehaus.mojo</groupId>
@@ -564,7 +564,7 @@
564564
<plugin>
565565
<groupId>org.codehaus.mojo</groupId>
566566
<artifactId>versions-maven-plugin</artifactId>
567-
<version>2.16.1</version>
567+
<version>2.16.2</version>
568568
</plugin>
569569
<plugin>
570570
<groupId>org.apache.maven.plugins</groupId>
@@ -597,7 +597,7 @@
597597
<plugin>
598598
<groupId>org.apache.maven.plugins</groupId>
599599
<artifactId>maven-surefire-plugin</artifactId>
600-
<version>3.2.1</version>
600+
<version>3.2.2</version>
601601
<configuration>
602602
<!-- Må ha @{argLine} ellers blir properties satt av jacoco-maven-plugin overkrevet -->
603603
<argLine>@{argLine} ${argLine}</argLine>
@@ -607,7 +607,7 @@
607607
<plugin>
608608
<groupId>org.codehaus.mojo</groupId>
609609
<artifactId>exec-maven-plugin</artifactId>
610-
<version>3.1.0</version>
610+
<version>3.1.1</version>
611611
</plugin>
612612
<plugin>
613613
<groupId>org.jacoco</groupId>
@@ -707,7 +707,7 @@
707707
</plugin>
708708

709709
<plugin>
710-
<groupId>org.jboss.jandex</groupId>
710+
<groupId>io.smallrye</groupId>
711711
<artifactId>jandex-maven-plugin</artifactId>
712712
</plugin>
713713
</plugins>

‎pom.xml

+7-31
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<version>2.0.0-SNAPSHOT</version>
1111

1212
<properties>
13-
<java.version>17</java.version>
13+
<java.version>21</java.version>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1616
<argLine>-Xms256m -Dlog.level.no.nav=WARN -Dfile.encoding=${project.build.sourceEncoding}</argLine>
@@ -33,17 +33,14 @@
3333

3434
<weld-core-bom.version>4.0.3.Final</weld-core-bom.version>
3535

36-
<jandex-maven-plugin.version>1.2.3</jandex-maven-plugin.version>
36+
<jandex-maven-plugin.version>3.1.5</jandex-maven-plugin.version>
3737
<jandex.version>2.4.4.Final</jandex.version>
3838

3939
<jaxb-bom.version>3.0.2</jaxb-bom.version>
4040

4141
<hibernate-validator.version>7.0.5.Final</hibernate-validator.version>
4242
<hibernate.version>6.1.7.Final</hibernate.version>
4343

44-
<saaj-impl.version>2.0.1</saaj-impl.version>
45-
<xmlsec.version>3.0.3</xmlsec.version>
46-
4744
<jakarta.el.version>4.0.2</jakarta.el.version>
4845
<swagger.version>2.2.19</swagger.version>
4946

@@ -86,12 +83,6 @@
8683
<type>pom</type>
8784
</dependency>
8885

89-
<dependency>
90-
<groupId>no.nav.foreldrepenger</groupId>
91-
<artifactId>konfig</artifactId>
92-
<version>2.3.0</version>
93-
</dependency>
94-
9586
<!-- Jetty BOM -->
9687
<dependency>
9788
<groupId>org.eclipse.jetty</groupId>
@@ -195,13 +186,6 @@
195186
<version>3.13.0</version>
196187
</dependency>
197188

198-
<!-- Jakarta SOAP implementasjon -->
199-
<dependency>
200-
<groupId>com.sun.xml.messaging.saaj</groupId>
201-
<artifactId>saaj-impl</artifactId>
202-
<version>${saaj-impl.version}</version>
203-
</dependency>
204-
205189
<!-- Database -->
206190
<dependency>
207191
<groupId>org.flywaydb</groupId>
@@ -383,17 +367,6 @@
383367
<version>1.11.3</version>
384368
</dependency>
385369

386-
<dependency>
387-
<groupId>org.apache.santuario</groupId>
388-
<artifactId>xmlsec</artifactId>
389-
<version>${xmlsec.version}</version>
390-
<exclusions>
391-
<exclusion>
392-
<groupId>com.fasterxml.woodstox</groupId>
393-
<artifactId>woodstox-core</artifactId>
394-
</exclusion>
395-
</exclusions>
396-
</dependency>
397370
<dependency>
398371
<groupId>net.bytebuddy</groupId>
399372
<artifactId>byte-buddy</artifactId>
@@ -516,7 +489,7 @@
516489
<version>3.1.0</version>
517490
</plugin>
518491
<plugin>
519-
<groupId>org.jboss.jandex</groupId>
492+
<groupId>io.smallrye</groupId>
520493
<artifactId>jandex-maven-plugin</artifactId>
521494
<version>${jandex-maven-plugin.version}</version>
522495
<executions>
@@ -527,6 +500,9 @@
527500
</goals>
528501
</execution>
529502
</executions>
503+
<configuration>
504+
<indexVersion>10</indexVersion>
505+
</configuration>
530506
</plugin>
531507
<plugin>
532508
<groupId>org.codehaus.mojo</groupId>
@@ -707,7 +683,7 @@
707683
</plugin>
708684

709685
<plugin>
710-
<groupId>org.jboss.jandex</groupId>
686+
<groupId>io.smallrye</groupId>
711687
<artifactId>jandex-maven-plugin</artifactId>
712688
</plugin>
713689
</plugins>

0 commit comments

Comments
 (0)
Please sign in to comment.