Skip to content

Commit

Permalink
Bytter til Java 21. Sanerer WS ting. Konfig flyttes til felles. (#528)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrsladek
mrsladek authored Nov 17, 2023
1 parent 41c87e0 commit d067404
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 51 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
uses: navikt/fp-gha-workflows/.github/actions/setup-java-and-maven@main
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
java-version: '17'

- name: Verify
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .java-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17
21.0
36 changes: 18 additions & 18 deletions ee10/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<version>3.0.0-SNAPSHOT</version>

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

<jetty.version>12.0.2</jetty.version>
<jetty.version>12.0.3</jetty.version>
<jersey.version>3.1.3</jersey.version>

<logback.version>1.4.11</logback.version>
Expand All @@ -33,26 +33,23 @@

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

<jandex-maven-plugin.version>1.2.3</jandex-maven-plugin.version>
<jandex-maven-plugin.version>3.1.5</jandex-maven-plugin.version>
<jandex.version>2.4.4.Final</jandex.version>

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

<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
<hibernate.version>6.3.1.Final</hibernate.version>

<saaj-impl.version>3.0.3</saaj-impl.version>
<xmlsec.version>4.0.0</xmlsec.version>

<jakarta.el.version>4.0.2</jakarta.el.version>
<swagger.version>2.2.18</swagger.version>
<swagger.version>2.2.19</swagger.version>

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

<!-- Andre avhengigheter -->
<prometheus.version>0.16.0</prometheus.version>
<micrometer.version>1.11.5</micrometer.version>
<micrometer.version>1.12.0</micrometer.version>
<metrics.version>4.2.15</metrics.version>

<slf4j.version>2.0.9</slf4j.version>
Expand All @@ -61,13 +58,13 @@

<kafka.version>3.5.1</kafka.version>

<hikari.version>5.0.1</hikari.version>
<hikari.version>5.1.0</hikari.version>
<flyway.version>9.22.3</flyway.version>
<postgresql.version>42.6.0</postgresql.version>
<vault-jdbc.version>1.3.10</vault-jdbc.version>

<junit.version>5.10.0</junit.version>
<mockito.version>5.6.0</mockito.version>
<junit.version>5.10.1</junit.version>
<mockito.version>5.7.0</mockito.version>
<assertj.version>3.24.2</assertj.version>

<reflections.version>0.10.2</reflections.version>
Expand Down Expand Up @@ -368,13 +365,13 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>1.76</version>
<version>1.77</version>
</dependency>
<!-- https://github.com/advisories/GHSA-hr8g-6v94-x4m9 -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15to18</artifactId>
<version>1.76</version>
<version>1.77</version>
</dependency>
<!-- Fikser https://cwe.mitre.org/data/definitions/502.html -->
<dependency>
Expand Down Expand Up @@ -516,7 +513,7 @@
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.jboss.jandex</groupId>
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<version>${jandex-maven-plugin.version}</version>
<executions>
Expand All @@ -527,6 +524,9 @@
</goals>
</execution>
</executions>
<configuration>
<indexVersion>10</indexVersion>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -564,7 +564,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.16.1</version>
<version>2.16.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -597,7 +597,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.1</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 @@ -607,7 +607,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
Expand Down Expand Up @@ -707,7 +707,7 @@
</plugin>

<plugin>
<groupId>org.jboss.jandex</groupId>
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
</plugin>
</plugins>
Expand Down
38 changes: 7 additions & 31 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<version>2.0.0-SNAPSHOT</version>

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

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

<jandex-maven-plugin.version>1.2.3</jandex-maven-plugin.version>
<jandex-maven-plugin.version>3.1.5</jandex-maven-plugin.version>
<jandex.version>2.4.4.Final</jandex.version>

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

<hibernate-validator.version>7.0.5.Final</hibernate-validator.version>
<hibernate.version>6.1.7.Final</hibernate.version>

<saaj-impl.version>2.0.1</saaj-impl.version>
<xmlsec.version>3.0.3</xmlsec.version>

<jakarta.el.version>4.0.2</jakarta.el.version>
<swagger.version>2.2.19</swagger.version>

Expand Down Expand Up @@ -86,12 +83,6 @@
<type>pom</type>
</dependency>

<dependency>
<groupId>no.nav.foreldrepenger</groupId>
<artifactId>konfig</artifactId>
<version>2.3.0</version>
</dependency>

<!-- Jetty BOM -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down Expand Up @@ -195,13 +186,6 @@
<version>3.13.0</version>
</dependency>

<!-- Jakarta SOAP implementasjon -->
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<version>${saaj-impl.version}</version>
</dependency>

<!-- Database -->
<dependency>
<groupId>org.flywaydb</groupId>
Expand Down Expand Up @@ -383,17 +367,6 @@
<version>1.11.3</version>
</dependency>

<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
<version>${xmlsec.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
Expand Down Expand Up @@ -516,7 +489,7 @@
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.jboss.jandex</groupId>
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<version>${jandex-maven-plugin.version}</version>
<executions>
Expand All @@ -527,6 +500,9 @@
</goals>
</execution>
</executions>
<configuration>
<indexVersion>10</indexVersion>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -707,7 +683,7 @@
</plugin>

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

0 comments on commit d067404

Please sign in to comment.