Skip to content

Commit 2952c7c

Browse files
ybelMekkybelMekk
authored
dep: update kotlin to 1.4.10 and ktor to 1.4.1 (#233)
* dep: overriding explicit dep. for kotlin sdlib, reflect and jdk, removes dep clash * dep: refactor dependencies version properties. * dep: refactor, remove stdlib-common explicit dep.
1 parent 72679d2 commit 2952c7c

File tree

4 files changed

+35
-26
lines changed

4 files changed

+35
-26
lines changed

‎pom.xml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<groupId>no.nav.security</groupId>
56
<artifactId>token-support</artifactId>
67
<version>1.3-SNAPSHOT</version>
78
<packaging>pom</packaging>
89
<name>token-support</name>
910
<description>
10-
This project consist of common modules to support security token handling in a java spring microservices architecture, with emphasis on OpenID Connect ID Tokens.
11-
</description>
11+
This project consist of common modules to support security token handling in a java spring microservices
12+
architecture, with emphasis on OpenID Connect ID Tokens.
13+
</description>
1214
<url>https://github.com/navikt/token-support</url>
1315
<licenses>
1416
<license>
@@ -18,7 +20,8 @@
1820
</licenses>
1921
<developers>
2022
<developer>
21-
<organization>NAV (Arbeids- og velferdsdirektoratet) - The Norwegian Labour and Welfare Administration</organization>
23+
<organization>NAV (Arbeids- og velferdsdirektoratet) - The Norwegian Labour and Welfare Administration
24+
</organization>
2225
<organizationUrl>https://www.nav.no</organizationUrl>
2326
</developer>
2427
</developers>
@@ -53,11 +56,12 @@
5356
<mockwebserver.version>4.9.0</mockwebserver.version>
5457
<caffeine.version>2.8.5</caffeine.version>
5558
<okhttp3.version>4.9.0</okhttp3.version>
56-
<ktor.version>1.3.2</ktor.version>
59+
<ktor.version>1.4.1</ktor.version>
5760
<kotlin.code.style>official</kotlin.code.style>
58-
<kotlin.version>1.3.72</kotlin.version>
61+
<kotlin.version>1.4.10</kotlin.version>
5962
<mock-oauth2-server.version>0.1.35</mock-oauth2-server.version>
6063
<groovy.version>3.0.6</groovy.version>
64+
<logback.version>1.2.3</logback.version>
6165
</properties>
6266

6367
<scm>
@@ -123,13 +127,13 @@
123127
<activeByDefault>true</activeByDefault>
124128
</activation>
125129
<build>
126-
<plugins>
127-
<plugin>
128-
<groupId>org.apache.maven.plugins</groupId>
129-
<artifactId>maven-surefire-plugin</artifactId>
130-
<version>2.22.1</version>
131-
</plugin>
132-
</plugins>
130+
<plugins>
131+
<plugin>
132+
<groupId>org.apache.maven.plugins</groupId>
133+
<artifactId>maven-surefire-plugin</artifactId>
134+
<version>2.22.1</version>
135+
</plugin>
136+
</plugins>
133137
</build>
134138
</profile>
135139
<profile>

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,7 @@
1010
<artifactId>token-client-kotlin-demo</artifactId>
1111
<name>token-client-kotlin-demo</name>
1212
<properties>
13-
<ktor.version>1.4.0</ktor.version>
1413
<kotlin.code.style>official</kotlin.code.style>
15-
<kotlin.version>1.4.0</kotlin.version>
16-
<kotlin.cio.version>1.3.2</kotlin.cio.version>
17-
<logback.version>1.2.3</logback.version>
18-
<mock.oauth.version>0.1.34</mock.oauth.version>
1914
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2015
<main.class>io.ktor.server.netty.EngineMain</main.class>
2116
</properties>
@@ -51,6 +46,10 @@
5146
<dependency>
5247
<groupId>org.jetbrains.kotlin</groupId>
5348
<artifactId>kotlin-stdlib</artifactId>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.jetbrains.kotlin</groupId>
52+
<artifactId>kotlin-reflect</artifactId>
5453
<version>${kotlin.version}</version>
5554
</dependency>
5655
<dependency>
@@ -70,8 +69,8 @@
7069
</dependency>
7170
<dependency>
7271
<groupId>io.ktor</groupId>
73-
<artifactId>ktor-client-cio</artifactId>
74-
<version>${kotlin.cio.version}</version>
72+
<artifactId>ktor-client-cio-jvm</artifactId>
73+
<version>${ktor.version}</version>
7574
</dependency>
7675
<dependency>
7776
<groupId>io.ktor</groupId>
@@ -91,7 +90,6 @@
9190
<dependency>
9291
<groupId>no.nav.security</groupId>
9392
<artifactId>mock-oauth2-server</artifactId>
94-
<version>${mock.oauth.version}</version>
9593
</dependency>
9694
</dependencies>
9795
<build>

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
<artifactId>token-validation-ktor-demo</artifactId>
1010
<name>token-validation-ktor-demo</name>
1111
<properties>
12-
<ktor_version>1.3.2</ktor_version>
1312
<kotlin.code.style>official</kotlin.code.style>
14-
<kotlin_version>1.3.71</kotlin_version>
15-
<logback_version>1.2.3</logback_version>
1613
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1714
<!--kotlin.compiler.incremental>true</kotlin.compiler.incremental-->
1815
<main.class>io.ktor.server.netty.EngineMain</main.class>
@@ -31,10 +28,15 @@
3128
<artifactId>kotlin-stdlib</artifactId>
3229
<version>${kotlin.version}</version>
3330
</dependency>
31+
<dependency>
32+
<groupId>org.jetbrains.kotlin</groupId>
33+
<artifactId>kotlin-reflect</artifactId>
34+
<version>${kotlin.version}</version>
35+
</dependency>
3436
<dependency>
3537
<groupId>ch.qos.logback</groupId>
3638
<artifactId>logback-classic</artifactId>
37-
<version>${logback_version}</version>
39+
<version>${logback.version}</version>
3840
</dependency>
3941
<dependency>
4042
<groupId>io.ktor</groupId>
@@ -103,7 +105,7 @@
103105
<plugin>
104106
<groupId>org.jetbrains.kotlin</groupId>
105107
<artifactId>kotlin-maven-plugin</artifactId>
106-
<version>${kotlin_version}</version>
108+
<version>${kotlin.version}</version>
107109
<executions>
108110
<execution>
109111
<id>compile</id>

‎token-validation-ktor/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@
3333
<artifactId>kotlin-stdlib</artifactId>
3434
<version>${kotlin.version}</version>
3535
</dependency>
36+
<dependency>
37+
<groupId>org.jetbrains.kotlin</groupId>
38+
<artifactId>kotlin-reflect</artifactId>
39+
<version>${kotlin.version}</version>
40+
</dependency>
3641
<dependency>
3742
<groupId>io.ktor</groupId>
3843
<artifactId>ktor-auth</artifactId>

0 commit comments

Comments
 (0)