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 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <parameters>true</parameters> - <encoding>UTF-8</encoding> - <source>${kontrakt.java.version}</source> - <target>${kontrakt.java.version}</target> - <release>${kontrakt.java.version}</release> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>false</skip> - </configuration> - </plugin> - </plugins> - </build> </project> 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 @@ </plugins> </pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <inherited>true</inherited> - </plugin> - </plugins> </build> </project> 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 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <parameters>true</parameters> - <encoding>UTF-8</encoding> - <source>${kontrakt.java.version}</source> - <target>${kontrakt.java.version}</target> - <release>${kontrakt.java.version}</release> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>false</skip> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> diff --git a/pom.xml b/pom.xml index 749f05f92..f9f43067a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>no.nav.foreldrepenger.felles</groupId> + <artifactId>fp-bom</artifactId> + <version>3.6.2</version> + </parent> + <groupId>no.nav.foreldrepenger.vtp</groupId> <artifactId>vtp</artifactId> + <version>1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>VTP :: Root</name> - <version>1.0-SNAPSHOT</version> - - <scm> - <connection>scm:git:https://github.com/navikt/vtp.git</connection> - <developerConnection>scm:git:https://github.com/navikt/vtp.git</developerConnection> - <url>https://github.com/navikt/vtp</url> - <tag>vtp</tag> - </scm> <modules> <module>kontrakter</module> @@ -26,17 +24,7 @@ </modules> <properties> - <java.version>21</java.version> - <kontrakt.java.version>17</kontrakt.java.version> <!-- Behold til K9 er på J21. --> - <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> - <maven.compiler.source>${java.version}</maven.compiler.source> - <maven.compiler.target>${java.version}</maven.compiler.target> - - <!-- Sonar felles --> - <sonar.organization>navikt</sonar.organization> - <sonar.host.url>https://sonarcloud.io</sonar.host.url> + <!-- Sonar --> <sonar.moduleKey>${project.artifactId}</sonar.moduleKey> <sonar.projectName>vtp</sonar.projectName> <sonar.projectKey>navikt_vtp</sonar.projectKey> @@ -45,21 +33,11 @@ <fp-kontrakter.version>9.2.1</fp-kontrakter.version> <!-- Eksterne avhengigheter --> - <swagger-codegen-maven-plugin.version>3.0.66</swagger-codegen-maven-plugin.version> <!-- > 3.0.41 har bug med slf4.. --> + <swagger-codegen-maven-plugin.version>3.0.66</swagger-codegen-maven-plugin.version> <graphql-java.version>22.3</graphql-java.version> <graphql-scalar-java.version>22.0</graphql-scalar-java.version> <avro.version>1.12.0</avro.version> <kafka.version>3.5.1</kafka.version> - - <!-- Java Enterprise --> - <jakarta.jakartaee-bom.version>10.0.0</jakarta.jakartaee-bom.version> - <logstash.version>8.0</logstash.version> - <jetty.version>12.0.16</jetty.version> - <jersey.version>3.1.10</jersey.version> - <slf4j.version>2.0.16</slf4j.version> - <logback.version>1.5.16</logback.version> - <swagger.version>2.2.28</swagger.version> - <mockito.version>5.15.2</mockito.version> </properties> <repositories> @@ -76,157 +54,14 @@ <dependencyManagement> <dependencies> - <!-- Jakarta EE API BOM --> - <dependency> - <groupId>jakarta.platform</groupId> - <artifactId>jakarta.jakartaee-bom</artifactId> - <version>${jakarta.jakartaee-bom.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - - <!-- Jackson BOM --> <dependency> - <groupId>com.fasterxml.jackson</groupId> - <artifactId>jackson-bom</artifactId> - <version>2.18.2</version> + <groupId>no.nav.foreldrepenger.felles</groupId> + <artifactId>fp-bom</artifactId> + <version>3.6.2</version> <scope>import</scope> <type>pom</type> </dependency> - <!-- Jetty BOM --> - <dependency> - <groupId>org.eclipse.jetty.ee10</groupId> - <artifactId>jetty-ee10-bom</artifactId> - <version>${jetty.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - - <!-- Jersey BOM --> - <dependency> - <groupId>org.glassfish.jersey</groupId> - <artifactId>jersey-bom</artifactId> - <version>${jersey.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - - <!-- Swagger starter--> - <dependency> - <groupId>io.swagger.core.v3</groupId> - <artifactId>swagger-jaxrs2-jakarta</artifactId> - <version>${swagger.version}</version> - </dependency> - <dependency> - <groupId>io.swagger.core.v3</groupId> - <artifactId>swagger-annotations-jakarta</artifactId> - <version>${swagger.version}</version> - </dependency> - <dependency> - <groupId>io.swagger.core.v3</groupId> - <artifactId>swagger-core-jakarta</artifactId> - <version>${swagger.version}</version> - </dependency> - - <dependency> - <groupId>net.logstash.logback</groupId> - <artifactId>logstash-logback-encoder</artifactId> - <version>${logstash.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jul-to-slf4j</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>${logback.version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.17.0</version> - </dependency> - - <!-- Kafka --> - <dependency> - <groupId>org.apache.kafka</groupId> - <artifactId>kafka-clients</artifactId> - <version>${kafka.version}</version> - </dependency> - <dependency> - <groupId>org.apache.kafka</groupId> - <artifactId>kafka-streams</artifactId> - <version>${kafka.version}</version> - </dependency> - <dependency> - <groupId>org.apache.kafka</groupId> - <artifactId>kafka_2.12</artifactId> - <version>${kafka.version}</version> - </dependency> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> - <version>${avro.version}</version> - </dependency> - <dependency> - <groupId>io.confluent</groupId> - <artifactId>kafka-avro-serializer</artifactId> - <version>7.8.0</version> - </dependency> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>3.9.3</version> - </dependency> - - <dependency> - <groupId>com.graphql-java</groupId> - <artifactId>graphql-java</artifactId> - <version>${graphql-java.version}</version> - </dependency> - <dependency> - <groupId>com.graphql-java</groupId> - <artifactId>graphql-java-extended-scalars</artifactId> - <version>${graphql-scalar-java.version}</version> - </dependency> - - <dependency> - <groupId>com.unboundid</groupId> - <artifactId>unboundid-ldapsdk</artifactId> - <version>7.0.2</version> - </dependency> - - <dependency> - <groupId>org.bitbucket.b_c</groupId> - <artifactId>jose4j</artifactId> - <version>0.9.6</version> - </dependency> - - <dependency> - <groupId>org.apache.pdfbox</groupId> - <artifactId>pdfbox</artifactId> - <version>3.0.4</version> - </dependency> - - <dependency> - <groupId>com.neovisionaries</groupId> - <artifactId>nv-i18n</artifactId> - <version>1.29</version> - </dependency> - <!-- Interne prosjektavhengigheter --> <dependency> <groupId>no.nav.foreldrepenger.vtp</groupId> @@ -391,19 +226,78 @@ <version>${project.version}</version> </dependency> + <!-- Kafka --> + <dependency> + <groupId>org.apache.kafka</groupId> + <artifactId>kafka-clients</artifactId> + <version>${kafka.version}</version> + </dependency> + <dependency> + <groupId>org.apache.kafka</groupId> + <artifactId>kafka-streams</artifactId> + <version>${kafka.version}</version> + </dependency> + <dependency> + <groupId>org.apache.kafka</groupId> + <artifactId>kafka_2.12</artifactId> + <version>${kafka.version}</version> + </dependency> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + <version>${avro.version}</version> + </dependency> + <dependency> + <groupId>io.confluent</groupId> + <artifactId>kafka-avro-serializer</artifactId> + <version>7.8.0</version> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>3.9.3</version> + </dependency> + + <dependency> + <groupId>com.graphql-java</groupId> + <artifactId>graphql-java</artifactId> + <version>${graphql-java.version}</version> + </dependency> + <dependency> + <groupId>com.graphql-java</groupId> + <artifactId>graphql-java-extended-scalars</artifactId> + <version>${graphql-scalar-java.version}</version> + </dependency> + + <dependency> + <groupId>com.unboundid</groupId> + <artifactId>unboundid-ldapsdk</artifactId> + <version>7.0.2</version> + </dependency> + + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox</artifactId> + <version>3.0.4</version> + </dependency> + + <dependency> + <groupId>com.neovisionaries</groupId> + <artifactId>nv-i18n</artifactId> + <version>1.29</version> + </dependency> + <!-- Nav Avhengigheter – kontrakt --> <dependency> <groupId>no.nav.foreldrepenger.kontrakter</groupId> <artifactId>fp-ws-proxy-v1</artifactId> <version>${fp-kontrakter.version}</version> </dependency> - <dependency> <groupId>no.nav.teamdokumenthandtering</groupId> <artifactId>teamdokumenthandtering-avro-schemas</artifactId> <version>3aec620a</version> </dependency> - <dependency> <!-- abakus --> <groupId>no.nav.tjenester</groupId> <artifactId>aordningen-inntektsinformasjon-v1</artifactId> @@ -413,10 +307,6 @@ </dependencyManagement> <dependencies> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -424,182 +314,12 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.16.1</version> - </dependency> - - <!-- TEST --> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <version>3.27.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter</artifactId> - <version>5.11.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>${mockito.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-junit-jupiter</artifactId> - <version>${mockito.version}</version> - <scope>test</scope> </dependency> </dependencies> <build> <pluginManagement> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>3.8.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.13.0</version> - <configuration> - <parameters>true</parameters> - <encoding>UTF-8</encoding> - <source>${java.version}</source> - <target>${java.version}</target> - <release>${java.version}</release> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>3.1.3</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>versions-maven-plugin</artifactId> - <version>2.18.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>3.4.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>3.3.1</version> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>3.1.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>3.4.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>3.5.2</version> - <configuration> - <!-- Må ha @{argLine} ellers blir properties satt av jacoco-maven-plugin overkrevet --> - <argLine>@{argLine} ${argLine}</argLine> - </configuration> - </plugin> - <!-- Kjører Databaseskjemainitialisering ved testing fra kommandolinja --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>3.5.0</version> - </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.8.12</version> - <configuration> - <excludes> - <exclude>**/*no/nav*/**Test.class</exclude> - <exclude>*.xml</exclude> - </excludes> - </configuration> - <executions> - <execution> - <id>prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - <execution> - <id>report-generate</id> - <phase>verify</phase> - <goals> - <goal>report</goal> - </goals> - </execution> - <execution> - <id>report-aggregate</id> - <phase>verify</phase> - <goals> - <goal>report-aggregate</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>3.3.1</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>flatten-maven-plugin</artifactId> - <version>1.6.0</version> - <configuration> - <flattenMode>bom</flattenMode> - <flattenedPomFilename>.flattened</flattenedPomFilename> - </configuration> - <executions> - <execution> - <id>flatten</id> - <phase>process-resources</phase> - <goals> - <goal>flatten</goal> - </goals> - </execution> - <execution> - <id>flatten.clean</id> - <phase>clean</phase> - <goals> - <goal>clean</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>3.5.0</version> - </plugin> - <plugin> - <groupId>org.sonarsource.scanner.maven</groupId> - <artifactId>sonar-maven-plugin</artifactId> - <version>5.0.0.4389</version> - </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> @@ -630,43 +350,7 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>enforce</id> - <configuration> - <rules> - <DependencyConvergence/> - </rules> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>versions-maven-plugin</artifactId> + <artifactId>maven-source-plugin</artifactId> </plugin> </plugins> </build> @@ -696,6 +380,13 @@ </profile> </profiles> + <scm> + <connection>scm:git:https://github.com/navikt/vtp.git</connection> + <developerConnection>scm:git:https://github.com/navikt/vtp.git</developerConnection> + <url>https://github.com/navikt/vtp</url> + <tag>vtp</tag> + </scm> + <distributionManagement> <repository> <id>github</id> 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 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> + <plugin> <groupId>org.apache.avro</groupId> <artifactId>avro-maven-plugin</artifactId>