diff --git a/kontrakter/pom.xml b/kontrakter/pom.xml index eca90eaff..99e1b5932 100644 --- a/kontrakter/pom.xml +++ b/kontrakter/pom.xml @@ -29,26 +29,4 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - - true - UTF-8 - ${kontrakt.java.version} - ${kontrakt.java.version} - ${kontrakt.java.version} - - - - org.apache.maven.plugins - maven-deploy-plugin - - false - - - - diff --git a/mocks/pom.xml b/mocks/pom.xml index ca7198be2..7a61dfc9d 100644 --- a/mocks/pom.xml +++ b/mocks/pom.xml @@ -100,15 +100,5 @@ - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - true - - diff --git a/model/pom.xml b/model/pom.xml index c7cc23651..ea7965806 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -40,24 +40,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - true - UTF-8 - ${kontrakt.java.version} - ${kontrakt.java.version} - ${kontrakt.java.version} - - - - org.apache.maven.plugins - maven-deploy-plugin - - false - - org.apache.maven.plugins maven-jar-plugin diff --git a/pom.xml b/pom.xml index 749f05f92..f9f43067a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,21 +1,19 @@ - 4.0.0 + + no.nav.foreldrepenger.felles + fp-bom + 3.6.2 + + no.nav.foreldrepenger.vtp vtp + 1.0-SNAPSHOT pom VTP :: Root - 1.0-SNAPSHOT - - - scm:git:https://github.com/navikt/vtp.git - scm:git:https://github.com/navikt/vtp.git - https://github.com/navikt/vtp - vtp - kontrakter @@ -26,17 +24,7 @@ - 21 - 17 - UTF-8 - UTF-8 - -Xms256m -Dlog.level.no.nav=WARN -Dfile.encoding=${project.build.sourceEncoding} - ${java.version} - ${java.version} - - - navikt - https://sonarcloud.io + ${project.artifactId} vtp navikt_vtp @@ -45,21 +33,11 @@ 9.2.1 - 3.0.66 + 3.0.66 22.3 22.0 1.12.0 3.5.1 - - - 10.0.0 - 8.0 - 12.0.16 - 3.1.10 - 2.0.16 - 1.5.16 - 2.2.28 - 5.15.2 @@ -76,157 +54,14 @@ - - - jakarta.platform - jakarta.jakartaee-bom - ${jakarta.jakartaee-bom.version} - import - pom - - - - com.fasterxml.jackson - jackson-bom - 2.18.2 + no.nav.foreldrepenger.felles + fp-bom + 3.6.2 import pom - - - org.eclipse.jetty.ee10 - jetty-ee10-bom - ${jetty.version} - import - pom - - - - - org.glassfish.jersey - jersey-bom - ${jersey.version} - import - pom - - - - - 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} - - - - net.logstash.logback - logstash-logback-encoder - ${logstash.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} - - - org.apache.commons - commons-lang3 - 3.17.0 - - - - - org.apache.kafka - kafka-clients - ${kafka.version} - - - org.apache.kafka - kafka-streams - ${kafka.version} - - - org.apache.kafka - kafka_2.12 - ${kafka.version} - - - org.apache.avro - avro - ${avro.version} - - - io.confluent - kafka-avro-serializer - 7.8.0 - - - org.apache.zookeeper - zookeeper - 3.9.3 - - - - com.graphql-java - graphql-java - ${graphql-java.version} - - - com.graphql-java - graphql-java-extended-scalars - ${graphql-scalar-java.version} - - - - com.unboundid - unboundid-ldapsdk - 7.0.2 - - - - org.bitbucket.b_c - jose4j - 0.9.6 - - - - org.apache.pdfbox - pdfbox - 3.0.4 - - - - com.neovisionaries - nv-i18n - 1.29 - - no.nav.foreldrepenger.vtp @@ -391,19 +226,78 @@ ${project.version} + + + org.apache.kafka + kafka-clients + ${kafka.version} + + + org.apache.kafka + kafka-streams + ${kafka.version} + + + org.apache.kafka + kafka_2.12 + ${kafka.version} + + + org.apache.avro + avro + ${avro.version} + + + io.confluent + kafka-avro-serializer + 7.8.0 + + + org.apache.zookeeper + zookeeper + 3.9.3 + + + + com.graphql-java + graphql-java + ${graphql-java.version} + + + com.graphql-java + graphql-java-extended-scalars + ${graphql-scalar-java.version} + + + + com.unboundid + unboundid-ldapsdk + 7.0.2 + + + + org.apache.pdfbox + pdfbox + 3.0.4 + + + + com.neovisionaries + nv-i18n + 1.29 + + no.nav.foreldrepenger.kontrakter fp-ws-proxy-v1 ${fp-kontrakter.version} - no.nav.teamdokumenthandtering teamdokumenthandtering-avro-schemas 3aec620a - no.nav.tjenester aordningen-inntektsinformasjon-v1 @@ -413,10 +307,6 @@ - - ch.qos.logback - logback-classic - org.slf4j slf4j-api @@ -424,182 +314,12 @@ net.bytebuddy byte-buddy - 1.16.1 - - - - - org.assertj - assertj-core - 3.27.3 - test - - - org.junit.jupiter - junit-jupiter - 5.11.4 - test - - - org.mockito - mockito-core - ${mockito.version} - test - - - org.mockito - mockito-junit-jupiter - ${mockito.version} - test - - org.apache.maven.plugins - maven-dependency-plugin - 3.8.1 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - true - UTF-8 - ${java.version} - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-install-plugin - 3.1.3 - - - org.codehaus.mojo - versions-maven-plugin - 2.18.0 - - - org.apache.maven.plugins - maven-clean-plugin - 3.4.0 - - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 3.1.3 - - - org.apache.maven.plugins - maven-jar-plugin - 3.4.2 - - - org.apache.maven.plugins - maven-surefire-plugin - 3.5.2 - - - @{argLine} ${argLine} - - - - - org.codehaus.mojo - exec-maven-plugin - 3.5.0 - - - org.jacoco - jacoco-maven-plugin - 0.8.12 - - - **/*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.6.0 - - bom - .flattened - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.5.0 - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 5.0.0.4389 - org.codehaus.mojo build-helper-maven-plugin @@ -630,43 +350,7 @@ org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce - - - - - - - - - - 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 + maven-source-plugin @@ -696,6 +380,13 @@ + + scm:git:https://github.com/navikt/vtp.git + scm:git:https://github.com/navikt/vtp.git + https://github.com/navikt/vtp + vtp + + github diff --git a/server/pom.xml b/server/pom.xml index 3b89a94f2..5b634894b 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -239,13 +239,7 @@ - - org.apache.maven.plugins - maven-deploy-plugin - - true - - + org.apache.avro avro-maven-plugin