diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5ce43e67..c65fc7f4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,22 +21,26 @@ jobs:
contents: read
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v3.3.0
with:
fetch-depth: "0"
- - name: Setup maven
- uses: whelk-io/maven-settings-xml-action@v21
+ - name: Setup java and maven
+ uses: navikt/fp-gha-workflows/.github/actions/setup-java-and-maven@main
with:
- repositories: '[{ "id": "github", "name": "github", "url": "https://maven.pkg.github.com/${{ github.repository }}", "releases": { "enabled": "true" }, "snapshots": { "enabled": "false" } }]'
- servers: '[{ "id": "github", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
- output_file: settings.xml
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+ java-version: '17'
- - name: Bygg
+ - name: Verify
shell: bash
run: |
mvn verify -e -B -s settings.xml
+ - name: Verify EE9
+ shell: bash
+ run: |
+ mvn verify -e -B -s settings.xml -f ./ee9/pom.xml
+
release-drafter:
name: Update
permissions:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e87d8106..72918233 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,7 +1,7 @@
name: Publiser release
on:
release:
- types: [published]
+ types: [ published ]
jobs:
release:
@@ -13,3 +13,24 @@ jobs:
release-version: ${{ github.event.release.tag_name }}
release-profiles: ''
secrets: inherit
+
+ release-ee9:
+ name: Kontrakt EE9
+ needs: release
+ permissions:
+ packages: write
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v3.3.0
+
+ - name: Setup java and maven
+ uses: navikt/fp-gha-workflows/.github/actions/setup-java-and-maven@main
+ with:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+ java-version: '17'
+
+ - name: Publish artifacts
+ run: |
+ mvn -B -s settings.xml versions:set -DnewVersion=${{ github.event.release.tag_name }} -f ./ee9/pom.xml
+ mvn -B -s settings.xml -DskipTests clean deploy -f ./ee9/pom.xml
diff --git a/README.md b/README.md
index 2ea32109..380b6dcc 100644
--- a/README.md
+++ b/README.md
@@ -51,3 +51,7 @@ Fasses ut:
* DB Change Management - [Flyway DB](https://flywaydb.org/)
* Connection Pool Management - [HikariCP](https://github.com/brettwooldridge/HikariCP)
* Monitoring - [Prometheus](https://prometheus.io/) + [Micrometer](https://micrometer.io/) + [Dropwizard Metrics](https://metrics.dropwizard.io/4.2.0/)
+
+### Migrering til jakarta
+* Swagger dependencies endrer artefakt postfix til `-jakarta`. F.eks: `swagger-jaxrs2` blir til `swagger-jaxrs2-jakarta` versjonen er den samme.
+* Jandex endrer groupId fra `org.jboss` til `io.smallrye`
diff --git a/ee9/pom.xml b/ee9/pom.xml
new file mode 100644
index 00000000..aec6440e
--- /dev/null
+++ b/ee9/pom.xml
@@ -0,0 +1,702 @@
+
+
+ 4.0.0
+
+ no.nav.foreldrepenger.felles
+ fp-bom-jakarta
+ pom
+ Foreldrepenger :: EE9 Bill of Materials
+ 2.0.0-SNAPSHOT
+
+
+ 17
+ UTF-8
+ UTF-8
+ -Xms256m -Dlog.level.no.nav=WARN -Dfile.encoding=${project.build.sourceEncoding}
+ ${java.version}
+ ${java.version}
+
+
+ navikt
+ https://sonarcloud.io
+
+
+ 9.1.0
+
+ 11.0.15
+ 3.0.8
+
+ 3.1.0
+
+ 1.4.8
+
+ 4.0.2
+
+ 4.0.3.Final
+
+ 3.0.5
+
+ 3.0.1
+
+ 7.0.5.Final
+ 6.0.2.Final
+
+ 2.0.1
+ 3.0.2
+
+ 4.0.0
+ 2.2.14
+
+
+ 3.1.0
+
+
+ 0.16.0
+ 1.11.1
+ 4.2.15
+
+ 2.0.7
+ 7.4
+ 1.0.0
+
+ 3.5.0
+
+ 5.0.1
+ 9.20.0
+ 42.6.0
+ 1.3.10
+
+ 5.9.3
+ 5.4.0
+ 3.24.2
+
+ 0.10.2
+
+ 3.11.0
+
+
+
+
+
+
+ jakarta.platform
+ jakarta.jakartaee-bom
+ ${jakarta.jakartaee-bom.version}
+ import
+ pom
+
+
+
+ no.nav.foreldrepenger
+ konfig-jakarta
+ 2.0.0
+
+
+
+
+ org.eclipse.jetty
+ jetty-bom
+ ${jetty.version}
+ import
+ pom
+
+
+
+
+ org.jboss.weld
+ weld-core-bom
+ ${weld-core-bom.version}
+ import
+ pom
+
+
+
+
+ io.smallrye
+ jandex
+ ${jandex.version}
+
+
+
+
+ com.fasterxml.jackson
+ jackson-bom
+ 2.15.2
+ import
+ pom
+
+
+
+
+ org.glassfish.jaxb
+ jaxb-bom
+ ${jaxb-bom.version}
+ import
+ pom
+
+
+
+
+ org.glassfish.jersey
+ jersey-bom
+ ${jersey.version}
+ import
+ pom
+
+
+
+
+ org.apache.cxf
+ cxf-bom
+ ${cxf.version}
+ import
+ pom
+
+
+
+
+ org.apache.kafka
+ kafka-clients
+ ${kafka.version}
+
+
+ org.apache.kafka
+ kafka-streams
+ ${kafka.version}
+
+
+
+
+ org.hibernate.validator
+ hibernate-validator
+ ${hibernate-validator.version}
+
+
+
+
+ org.hibernate
+ hibernate-core
+ ${hibernate.version}
+
+
+
+
+ org.apache.commons
+ commons-lang3
+ 3.12.0
+
+
+
+
+ com.sun.xml.messaging.saaj
+ saaj-impl
+ ${saaj-impl.version}
+
+
+
+
+ org.flywaydb
+ flyway-core
+ ${flyway.version}
+
+
+ org.flywaydb
+ flyway-database-oracle
+ ${flyway.version}
+
+
+
+ com.zaxxer
+ HikariCP
+ ${hikari.version}
+
+
+
+ org.postgresql
+ postgresql
+ ${postgresql.version}
+
+
+ no.nav
+ vault-jdbc
+ ${vault-jdbc.version}
+
+
+ org.slf4j
+ slf4j-simple
+
+
+
+
+
+ com.oracle.ojdbc
+ ojdbc8
+ 19.3.0.0
+
+
+
+
+ io.prometheus
+ simpleclient_bom
+ ${prometheus.version}
+ import
+ pom
+
+
+
+
+ io.micrometer
+ micrometer-registry-prometheus
+ ${micrometer.version}
+
+
+ io.micrometer
+ micrometer-core
+ ${micrometer.version}
+
+
+
+
+ net.logstash.logback
+ logstash-logback-encoder
+ ${logstash.version}
+
+
+ com.papertrailapp
+ logback-syslog4j
+ ${logback-syslog4j.version}
+
+
+ org.slf4j
+ slf4j-api
+ ${slf4j.version}
+
+
+ org.slf4j
+ jul-to-slf4j
+ ${slf4j.version}
+
+
+ org.slf4j
+ jcl-over-slf4j
+ ${slf4j.version}
+
+
+ ch.qos.logback
+ logback-classic
+ ${logback.version}
+
+
+
+
+ io.swagger.core.v3
+ swagger-jaxrs2-jakarta
+ ${swagger.version}
+
+
+ io.swagger.core.v3
+ swagger-annotations-jakarta
+ ${swagger.version}
+
+
+ io.swagger.core.v3
+ swagger-core-jakarta
+ ${swagger.version}
+
+
+
+
+
+ org.junit
+ junit-bom
+ ${junit.version}
+ pom
+ import
+
+
+
+
+ org.mockito
+ mockito-bom
+ ${mockito.version}
+ import
+ pom
+
+
+
+ org.assertj
+ assertj-core
+ ${assertj.version}
+
+
+
+
+ org.reflections
+ reflections
+ ${reflections.version}
+
+
+
+
+
+ commons-codec
+ commons-codec
+ 1.16.0
+
+
+
+ org.bouncycastle
+ bcprov-jdk15on
+ 1.70
+
+
+ org.apache.santuario
+ xmlsec
+ ${xmlsec.version}
+
+
+ net.bytebuddy
+ byte-buddy
+ 1.14.5
+
+
+
+ org.javassist
+ javassist
+ 3.29.2-GA
+
+
+ org.jasypt
+ jasypt
+ 1.9.3
+
+
+ io.swagger
+ swagger-compat-spec-parser
+ 1.0.67
+
+
+ com.fasterxml.woodstox
+ woodstox-core
+ 6.5.1
+
+
+
+ com.google.code.findbugs
+ jsr305
+ 3.0.2
+
+
+ org.glassfish
+ jakarta.el
+ ${jakarta.el.version}
+
+
+
+
+
+
+
+ ch.qos.logback
+ logback-classic
+
+
+ org.slf4j
+ jcl-over-slf4j
+ runtime
+
+
+ org.slf4j
+ jul-to-slf4j
+ runtime
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-params
+ test
+
+
+ org.assertj
+ assertj-core
+ test
+
+
+ org.mockito
+ mockito-core
+ test
+
+
+ org.mockito
+ mockito-junit-jupiter
+ test
+
+
+
+
+
+
+
+ src/main/resources
+ true
+
+ **/*.html
+
+
+
+ src/main/resources
+
+ **/*.html
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-remote-resources-plugin
+ 3.1.0
+
+
+ io.smallrye
+ jandex-maven-plugin
+ ${jandex.version}
+
+
+ make-index
+
+ jandex
+
+
+
+
+
+ org.codehaus.mojo
+ jaxb2-maven-plugin
+ ${jaxb2-maven-plugin.version}
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ 3.1.0
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 3.6.0
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ ${maven-compiler-plugin.version}
+
+ ${java.version}
+ ${java.version}
+ UTF-8
+ ${java.version}
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-install-plugin
+ 3.1.1
+
+
+ org.codehaus.mojo
+ versions-maven-plugin
+ 2.16.0
+
+
+ org.apache.maven.plugins
+ maven-clean-plugin
+ 3.3.1
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ 3.3.0
+
+
+ attach-sources
+
+ jar
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+ 3.1.1
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 3.3.0
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 3.1.2
+
+
+ @{argLine} ${argLine}
+
+
+
+
+ org.codehaus.mojo
+ exec-maven-plugin
+ 3.1.0
+
+
+ org.jacoco
+ jacoco-maven-plugin
+ 0.8.10
+
+
+ **/*no/nav*/**Test.class
+ *.xml
+
+
+
+
+ prepare-agent
+
+ prepare-agent
+
+
+
+ report-generate
+ verify
+
+ report
+
+
+
+ report-aggregate
+ verify
+
+ report-aggregate
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+ 3.3.1
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+ 1.5.0
+
+ bom
+ .flattened
+
+
+
+ flatten
+ process-resources
+
+ flatten
+
+
+
+ flatten.clean
+ clean
+
+ clean
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+ 3.3.0
+
+
+ org.sonarsource.scanner.maven
+ sonar-maven-plugin
+ 3.9.1.2184
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+
+ org.codehaus.mojo
+ versions-maven-plugin
+
+
+
+ io.smallrye
+ jandex-maven-plugin
+
+
+
+
+
+
+ sonar
+
+
+
+ org.jacoco
+ jacoco-maven-plugin
+
+
+
+
+
+ deploy
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
+
+
+
+
+ scm:git:https://github.com/navikt/fp-bom.git
+ scm:git:https://github.com/navikt/fp-bom.git
+ https://github.com/navikt/fp-bom
+
+
+
+
+ github
+ Github navikt Maven Packages
+ https://maven.pkg.github.com/navikt/fp-bom
+
+
+