Skip to content

Commit 8e0cb59

Browse files
espenwaagaespenwaaga
committed
Chore: Tar i bruk fp-parent-app
1 parent 05ea043 commit 8e0cb59

File tree

2 files changed

+51
-85
lines changed

2 files changed

+51
-85
lines changed

‎.github/dependabot.yml‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ updates:
1212
schedule:
1313
interval: daily
1414
open-pull-requests-limit: 10
15-
groups:
16-
minor-deps:
17-
update-types:
18-
- "minor"
19-
- "patch"
2015
- package-ecosystem: maven
2116
directory: "/"
2217
registries:
@@ -31,20 +26,12 @@ updates:
3126
dependency-type: "production"
3227
exclude-patterns:
3328
- "no.nav.*"
34-
update-types:
35-
- "minor"
36-
- "patch"
3729
dev-deps:
3830
dependency-type: "development"
3931
exclude-patterns:
4032
- "no.nav.*"
41-
update-types:
42-
- "minor"
43-
- "patch"
4433
interne-deps:
4534
patterns:
4635
- "no.nav.*"
47-
update-types:
48-
- "minor"
49-
- "patch"
50-
36+
exclude-patterns:
37+
- "no.nav.folketrygdloven.*"

‎pom.xml‎

Lines changed: 49 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6+
<parent>
7+
<groupId>no.nav.foreldrepenger.felles</groupId>
8+
<artifactId>fp-parent-app</artifactId>
9+
<version>5.0.2</version>
10+
</parent>
11+
612
<groupId>no.nav.foreldrepenger.autotest</groupId>
713
<artifactId>autotest</artifactId>
814
<packaging>jar</packaging>
@@ -17,54 +23,59 @@
1723
</licenses>
1824

1925
<properties>
20-
<java.version>25</java.version>
21-
<maven.compiler.source>${java.version}</maven.compiler.source>
22-
<maven.compiler.target>${java.version}</maven.compiler.target>
23-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
25-
<user.timezone>Europe/Oslo</user.timezone> <!-- Sørger for samme tidssone lokalt og på github -->
26-
2726
<vtp.versjon>2.1.1</vtp.versjon>
2827
<fp-felles.versjon>7.6.8</fp-felles.versjon>
2928
<fp-prosesstask.version>5.2.1</fp-prosesstask.version>
3029
<fp-kontrakter.version>9.4.8</fp-kontrakter.version>
3130
<ftberegning.version>6.1.6</ftberegning.version>
3231

33-
<slf4j.version>2.0.17</slf4j.version>
34-
<logback.version>1.5.21</logback.version>
32+
<pdfbox.version>3.0.6</pdfbox.version>
3533
<allure.version>2.29.1</allure.version>
3634
<allure.maven.version>2.15.2</allure.maven.version>
37-
<assertj.version>3.27.6</assertj.version>
3835
<aspectj.version>1.9.24</aspectj.version>
39-
<junit.version>5.13.4</junit.version>
40-
<jackson.version>2.20.1</jackson.version>
41-
<jakarta.jakartaee-bom.version>11.0.0</jakarta.jakartaee-bom.version>
42-
<jersey.version>4.0.0-M4</jersey.version>
4336
</properties>
4437

4538
<dependencyManagement>
4639
<dependencies>
47-
<!-- Jakarta EE API BOM -->
4840
<dependency>
49-
<groupId>jakarta.platform</groupId>
50-
<artifactId>jakarta.jakartaee-bom</artifactId>
51-
<version>${jakarta.jakartaee-bom.version}</version>
41+
<groupId>no.nav.foreldrepenger.felles</groupId>
42+
<artifactId>felles</artifactId>
43+
<version>${fp-felles.versjon}</version>
5244
<scope>import</scope>
5345
<type>pom</type>
5446
</dependency>
5547
<dependency>
56-
<groupId>com.fasterxml.jackson</groupId>
57-
<artifactId>jackson-bom</artifactId>
58-
<version>${jackson.version}</version>
48+
<groupId>no.nav.foreldrepenger.kontrakter</groupId>
49+
<artifactId>fp-kontrakter-root</artifactId>
50+
<version>${fp-kontrakter.version}</version>
5951
<scope>import</scope>
6052
<type>pom</type>
6153
</dependency>
6254
<dependency>
63-
<groupId>org.junit</groupId>
64-
<artifactId>junit-bom</artifactId>
65-
<version>${junit.version}</version>
66-
<scope>import</scope>
67-
<type>pom</type>
55+
<groupId>no.nav.vedtak.prosesstask</groupId>
56+
<artifactId>prosesstask-rest-api</artifactId>
57+
<version>${fp-prosesstask.version}</version>
58+
</dependency>
59+
<dependency>
60+
<groupId>no.nav.folketrygdloven.kalkulus</groupId>
61+
<artifactId>beregning-kontrakt</artifactId>
62+
<version>${ftberegning.version}</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>no.nav.foreldrepenger.vtp</groupId>
66+
<artifactId>testmodell</artifactId>
67+
<version>${vtp.versjon}</version>
68+
</dependency>
69+
<dependency>
70+
<groupId>no.nav.foreldrepenger.vtp</groupId>
71+
<artifactId>kontrakter</artifactId>
72+
<version>${vtp.versjon}</version>
73+
</dependency>
74+
<dependency>
75+
<groupId>no.nav.foreldrepenger.kontrakter</groupId>
76+
<artifactId>fp-soknad</artifactId>
77+
<version>${fp-kontrakter.version}</version>
78+
<type>test-jar</type>
6879
</dependency>
6980
<dependency>
7081
<groupId>io.qameta.allure</groupId>
@@ -73,6 +84,11 @@
7384
<type>pom</type>
7485
<scope>import</scope>
7586
</dependency>
87+
<dependency>
88+
<groupId>org.apache.pdfbox</groupId>
89+
<artifactId>pdfbox</artifactId>
90+
<version>${pdfbox.version}</version>
91+
</dependency>
7692
</dependencies>
7793
</dependencyManagement>
7894

@@ -81,62 +97,51 @@
8197
<dependency>
8298
<groupId>no.nav.foreldrepenger.felles</groupId>
8399
<artifactId>felles-mapper</artifactId>
84-
<version>${fp-felles.versjon}</version>
85100
</dependency>
86101
<dependency>
87102
<groupId>no.nav.foreldrepenger.felles</groupId>
88103
<artifactId>felles-log</artifactId>
89-
<version>${fp-felles.versjon}</version>
90104
</dependency>
91105
<dependency>
92106
<groupId>no.nav.foreldrepenger.felles</groupId>
93107
<artifactId>felles-klient</artifactId>
94-
<version>${fp-felles.versjon}</version>
95108
</dependency>
96109
<dependency>
97110
<groupId>no.nav.vedtak.prosesstask</groupId>
98111
<artifactId>prosesstask-rest-api</artifactId>
99-
<version>${fp-prosesstask.version}</version>
100112
</dependency>
101113
<dependency>
102114
<groupId>no.nav.foreldrepenger.kontrakter</groupId>
103115
<artifactId>fordel-v1</artifactId>
104-
<version>${fp-kontrakter.version}</version>
105116
</dependency>
106117
<dependency>
107118
<groupId>no.nav.foreldrepenger.kontrakter</groupId>
108119
<artifactId>risk-v1</artifactId>
109-
<version>${fp-kontrakter.version}</version>
110120
</dependency>
111121
<dependency>
112122
<groupId>no.nav.foreldrepenger.kontrakter</groupId>
113123
<artifactId>inntektsmelding-v1</artifactId>
114-
<version>${fp-kontrakter.version}</version>
115124
</dependency>
116125
<dependency>
117126
<groupId>no.nav.foreldrepenger.kontrakter</groupId>
118127
<artifactId>fp-soknad</artifactId>
119-
<version>${fp-kontrakter.version}</version>
120128
</dependency>
121129
<dependency>
122130
<groupId>no.nav.foreldrepenger.kontrakter</groupId>
123131
<artifactId>fp-oversikt</artifactId>
124-
<version>${fp-kontrakter.version}</version>
125132
</dependency>
133+
126134
<dependency>
127135
<groupId>no.nav.foreldrepenger.vtp</groupId>
128136
<artifactId>testmodell</artifactId>
129-
<version>${vtp.versjon}</version>
130137
</dependency>
131138
<dependency>
132139
<groupId>no.nav.foreldrepenger.vtp</groupId>
133140
<artifactId>kontrakter</artifactId>
134-
<version>${vtp.versjon}</version>
135141
</dependency>
136142
<dependency>
137143
<groupId>no.nav.folketrygdloven.kalkulus</groupId>
138144
<artifactId>beregning-kontrakt</artifactId>
139-
<version>${ftberegning.version}</version>
140145
</dependency>
141146

142147
<!-- Eksterne avhengigheter (Http klient, jackson og tilhørende avhengigheter) -->
@@ -163,36 +168,30 @@
163168
<dependency>
164169
<groupId>org.glassfish.jersey.core</groupId>
165170
<artifactId>jersey-common</artifactId>
166-
<version>${jersey.version}</version>
167171
</dependency>
168172
<dependency>
169173
<groupId>io.smallrye</groupId>
170174
<artifactId>jandex</artifactId>
171-
<version>3.5.2</version>
172175
</dependency>
173176
<dependency>
174177
<groupId>org.slf4j</groupId>
175178
<artifactId>slf4j-api</artifactId>
176-
<version>${slf4j.version}</version>
177179
</dependency>
178180
<dependency>
179181
<groupId>ch.qos.logback</groupId>
180182
<artifactId>logback-classic</artifactId>
181-
<version>${logback.version}</version>
182183
</dependency>
183184

184185

185186
<!-- Testavhengigheter (brukes også i scr) -->
186187
<dependency>
187188
<groupId>no.nav.foreldrepenger.kontrakter</groupId>
188189
<artifactId>fp-soknad</artifactId>
189-
<version>${fp-kontrakter.version}</version>
190190
<type>test-jar</type>
191191
</dependency>
192192
<dependency>
193193
<groupId>org.assertj</groupId>
194194
<artifactId>assertj-core</artifactId>
195-
<version>${assertj.version}</version>
196195
</dependency>
197196
<dependency>
198197
<groupId>io.qameta.allure</groupId>
@@ -213,25 +212,16 @@
213212
<dependency>
214213
<groupId>org.apache.pdfbox</groupId>
215214
<artifactId>pdfbox</artifactId>
216-
<version>3.0.6</version>
217215
</dependency>
218216
</dependencies>
219217

220218
<build>
221-
<pluginManagement>
222-
<plugins>
223-
<plugin>
224-
<groupId>org.apache.maven.plugins</groupId>
225-
<artifactId>maven-surefire-plugin</artifactId>
226-
<version>3.5.4</version>
227-
</plugin>
228-
<plugin>
229-
<groupId>org.apache.maven.plugins</groupId>
230-
<artifactId>maven-compiler-plugin</artifactId>
231-
<version>3.14.1</version>
232-
</plugin>
233-
</plugins>
234-
</pluginManagement>
219+
<resources>
220+
<resource>
221+
<directory>src/main/resources</directory>
222+
<filtering>false</filtering>
223+
</resource>
224+
</resources>
235225
<plugins>
236226
<plugin>
237227
<groupId>org.apache.maven.plugins</groupId>
@@ -266,17 +256,6 @@
266256
<reportingOutputDirectory>target/allure-report</reportingOutputDirectory>
267257
</configuration>
268258
</plugin>
269-
<plugin>
270-
<groupId>org.apache.maven.plugins</groupId>
271-
<artifactId>maven-compiler-plugin</artifactId>
272-
<configuration>
273-
<parameters>true</parameters>
274-
<source>${java.version}</source>
275-
<target>${java.version}</target>
276-
<release>${java.version}</release>
277-
<encoding>UTF-8</encoding>
278-
</configuration>
279-
</plugin>
280259
</plugins>
281260
</build>
282261

0 commit comments

Comments
 (0)