Skip to content

Commit 571a54c

Browse files
jan-olaveideJan-Olav Eide
jan-olaveide
and
Jan-Olav Eide
authored
cleanup kotlin deps (#940)
Co-authored-by: Jan-Olav Eide <jan-olav,eide@nav.no>
1 parent 5012478 commit 571a54c

File tree

10 files changed

+20
-135
lines changed

10 files changed

+20
-135
lines changed

‎pom.xml

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</modules>
4242
<properties>
4343
<dokka.version>1.9.20</dokka.version>
44-
<kotlin.version>2.0.20</kotlin.version>
44+
<kotlin.version>1.9.25</kotlin.version>
4545
<kotlin-coroutines.version>1.6.2</kotlin-coroutines.version>
4646
<doclint>none</doclint>
4747
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
@@ -60,11 +60,10 @@
6060
<okhttp3.version>4.12.0</okhttp3.version>
6161
<ktor.version>2.3.12</ktor.version>
6262
<kotlin.code.style>official</kotlin.code.style>
63-
<kotlin.version>2.0.20</kotlin.version>
6463
<mock-oauth2-server.version>2.1.9</mock-oauth2-server.version>
6564
<nimbus.jose.jwt.version>9.40</nimbus.jose.jwt.version>
6665
<kotest.version>5.9.1</kotest.version>
67-
<kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
66+
<kotlin.compiler.jvmTarget>21</kotlin.compiler.jvmTarget>
6867
</properties>
6968
<scm>
7069
<url>https://github.com/navikt/token-support</url>
@@ -169,22 +168,6 @@
169168
</plugins>
170169
</build>
171170
<profiles>
172-
<!--
173-
<profile>
174-
<id>local</id>
175-
<activation>
176-
<activeByDefault>true</activeByDefault>
177-
</activation>
178-
<build>
179-
<plugins>
180-
<plugin>
181-
<groupId>org.apache.maven.plugins</groupId>
182-
<artifactId>maven-surefire-plugin</artifactId>
183-
<version>3.5.0</version>
184-
</plugin>
185-
</plugins>
186-
</build>
187-
</profile>-->
188171
<profile>
189172
<id>github</id>
190173
<activation>
@@ -398,20 +381,27 @@
398381
<version>${kotest.version}</version>
399382
<scope>test</scope>
400383
</dependency>
401-
<dependency>
402-
<groupId>org.jetbrains.kotlin</groupId>
403-
<artifactId>kotlin-stdlib-jdk8</artifactId>
404-
<version>${kotlin.version}</version>
405-
</dependency>
406-
<dependency>
407-
<groupId>org.jetbrains.kotlin</groupId>
408-
<artifactId>kotlin-test</artifactId>
409-
<version>${kotlin.version}</version>
410-
<scope>test</scope>
411-
</dependency>
412384
</dependencies>
413385
</dependencyManagement>
414386
<dependencies>
387+
<dependency>
388+
<groupId>org.jetbrains.kotlin</groupId>
389+
<artifactId>kotlin-stdlib-jdk8</artifactId>
390+
</dependency>
391+
<dependency>
392+
<groupId>org.jetbrains.kotlin</groupId>
393+
<artifactId>kotlin-reflect</artifactId>
394+
</dependency>
395+
<dependency>
396+
<groupId>org.jetbrains.kotlin</groupId>
397+
<artifactId>kotlin-test</artifactId>
398+
<scope>test</scope>
399+
</dependency>
400+
<dependency>
401+
<groupId>org.jetbrains.kotlin</groupId>
402+
<artifactId>kotlin-test-junit5</artifactId>
403+
<scope>test</scope>
404+
</dependency>
415405
<dependency>
416406
<groupId>org.junit.jupiter</groupId>
417407
<artifactId>junit-jupiter-params</artifactId>

‎token-client-core/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@
4343
<groupId>com.fasterxml.jackson.module</groupId>
4444
<artifactId>jackson-module-kotlin</artifactId>
4545
</dependency>
46-
<dependency>
47-
<groupId>org.jetbrains.kotlin</groupId>
48-
<artifactId>kotlin-stdlib</artifactId>
49-
<version>${kotlin.version}</version>
50-
</dependency>
5146
</dependencies>
5247
<build>
5348
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>

‎token-client-kotlin-demo/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<kotlin.code.style>official</kotlin.code.style>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<main.class>io.ktor.server.netty.EngineMain</main.class>
16-
<kotlin.compiler.jvmTarget>21</kotlin.compiler.jvmTarget>
1716
</properties>
1817
<dependencies>
1918
<dependency>
@@ -63,15 +62,6 @@
6362
<artifactId>token-validation-ktor-v2</artifactId>
6463
<version>${project.version}</version>
6564
</dependency>
66-
<dependency>
67-
<groupId>org.jetbrains.kotlin</groupId>
68-
<artifactId>kotlin-stdlib</artifactId>
69-
</dependency>
70-
<dependency>
71-
<groupId>org.jetbrains.kotlin</groupId>
72-
<artifactId>kotlin-reflect</artifactId>
73-
<version>${kotlin.version}</version>
74-
</dependency>
7565
<dependency>
7666
<groupId>io.ktor</groupId>
7767
<artifactId>ktor-client-core</artifactId>

‎token-client-spring-demo/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@
5252
<artifactId>spring-boot-starter-test</artifactId>
5353
<scope>test</scope>
5454
</dependency>
55-
<dependency>
56-
<groupId>org.jetbrains.kotlin</groupId>
57-
<artifactId>kotlin-stdlib</artifactId>
58-
<version>${kotlin.version}</version>
59-
</dependency>
6055
</dependencies>
6156
<build>
6257
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>

‎token-client-spring/pom.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,6 @@
99

1010
<artifactId>token-client-spring</artifactId>
1111
<dependencies>
12-
<dependency>
13-
<groupId>org.jetbrains.kotlin</groupId>
14-
<artifactId>kotlin-stdlib-jdk8</artifactId>
15-
</dependency>
16-
<dependency>
17-
<groupId>org.jetbrains.kotlin</groupId>
18-
<artifactId>kotlin-reflect</artifactId>
19-
</dependency>
20-
<dependency>
21-
<groupId>org.jetbrains.kotlin</groupId>
22-
<artifactId>kotlin-test</artifactId>
23-
<scope>test</scope>
24-
</dependency>
2512
<dependency>
2613
<groupId>no.nav.security</groupId>
2714
<artifactId>token-validation-core</artifactId>

‎token-validation-core/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@
3131
<artifactId>mockwebserver</artifactId>
3232
<scope>test</scope>
3333
</dependency>
34-
<dependency>
35-
<groupId>org.jetbrains.kotlin</groupId>
36-
<artifactId>kotlin-stdlib</artifactId>
37-
<version>${kotlin.version}</version>
38-
</dependency>
3934
</dependencies>
4035
<build>
4136
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>

‎token-validation-ktor-demo/pom.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,6 @@
1919
<artifactId>ktor-client-content-negotiation</artifactId>
2020
<version>2.2.4</version>
2121
</dependency>
22-
<dependency>
23-
<groupId>org.jetbrains.kotlin</groupId>
24-
<artifactId>kotlin-stdlib</artifactId>
25-
<version>${kotlin.version}</version>
26-
</dependency>
27-
<dependency>
28-
<groupId>org.jetbrains.kotlin</groupId>
29-
<artifactId>kotlin-reflect</artifactId>
30-
<version>${kotlin.version}</version>
31-
</dependency>
3222
<dependency>
3323
<groupId>io.ktor</groupId>
3424
<artifactId>ktor-server-auth-jvm</artifactId>
@@ -50,12 +40,6 @@
5040
<version>${mock-oauth2-server.version}</version>
5141
<scope>test</scope>
5242
</dependency>
53-
<dependency>
54-
<groupId>org.jetbrains.kotlin</groupId>
55-
<artifactId>kotlin-test-junit</artifactId>
56-
<version>${kotlin.version}</version>
57-
<scope>test</scope>
58-
</dependency>
5943
<dependency>
6044
<groupId>io.ktor</groupId>
6145
<artifactId>ktor-server-test-host</artifactId>

‎token-validation-ktor-v2/pom.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,6 @@
1313
<groupId>${project.groupId}</groupId>
1414
<artifactId>token-validation-core</artifactId>
1515
</dependency>
16-
<dependency>
17-
<groupId>org.jetbrains.kotlin</groupId>
18-
<artifactId>kotlin-stdlib</artifactId>
19-
<version>${kotlin.version}</version>
20-
</dependency>
21-
<dependency>
22-
<groupId>org.jetbrains.kotlin</groupId>
23-
<artifactId>kotlin-reflect</artifactId>
24-
<version>${kotlin.version}</version>
25-
</dependency>
2616
<dependency>
2717
<groupId>io.ktor</groupId>
2818
<artifactId>ktor-server</artifactId>
@@ -35,12 +25,6 @@
3525
<version>${ktor.version}</version>
3626
<scope>test</scope>
3727
</dependency>
38-
<dependency>
39-
<groupId>org.jetbrains.kotlin</groupId>
40-
<artifactId>kotlin-test-junit5</artifactId>
41-
<version>${kotlin.version}</version>
42-
<scope>test</scope>
43-
</dependency>
4428
<dependency>
4529
<groupId>io.ktor</groupId>
4630
<artifactId>ktor-server-test-host-jvm</artifactId>

‎token-validation-spring-test/pom.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@
1111

1212
<artifactId>token-validation-spring-test</artifactId>
1313

14-
<properties>
15-
<kotlin.version>2.0.20</kotlin.version>
16-
</properties>
17-
18-
1914
<dependencies>
2015
<dependency>
2116
<groupId>org.springframework.boot</groupId>
@@ -46,17 +41,6 @@
4641
<artifactId>spring-boot-starter-test</artifactId>
4742
<scope>test</scope>
4843
</dependency>
49-
<dependency>
50-
<groupId>org.jetbrains.kotlin</groupId>
51-
<artifactId>kotlin-stdlib-jdk8</artifactId>
52-
<version>${kotlin.version}</version>
53-
</dependency>
54-
<dependency>
55-
<groupId>org.jetbrains.kotlin</groupId>
56-
<artifactId>kotlin-test-junit</artifactId>
57-
<version>${kotlin.version}</version>
58-
<scope>test</scope>
59-
</dependency>
6044
</dependencies>
6145
<build>
6246
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>

‎token-validation-spring/pom.xml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,7 @@
88
</parent>
99
<artifactId>token-validation-spring</artifactId>
1010
<name>token-validation-spring</name>
11-
<properties>
12-
<kotlin.version>2.0.20</kotlin.version>
13-
</properties>
1411
<dependencies>
15-
<dependency>
16-
<groupId>org.jetbrains.kotlin</groupId>
17-
<artifactId>kotlin-stdlib-jdk8</artifactId>
18-
<version>${kotlin.version}</version>
19-
</dependency>
20-
<dependency>
21-
<groupId>org.jetbrains.kotlin</groupId>
22-
<artifactId>kotlin-reflect</artifactId>
23-
<version>${kotlin.version}</version>
24-
</dependency>
25-
<dependency>
26-
<groupId>org.jetbrains.kotlin</groupId>
27-
<artifactId>kotlin-test-junit</artifactId>
28-
<version>${kotlin.version}</version>
29-
<scope>test</scope>
30-
</dependency>
3112
<dependency>
3213
<groupId>${project.groupId}</groupId>
3314
<artifactId>token-validation-core</artifactId>

0 commit comments

Comments
 (0)