cleanup kotlin deps (#940)

Co-authored-by: Jan-Olav Eide <jan-olav,[email protected]>
navikt · Sep 2, 2024 · 571a54c · 571a54c
1 parent 5012478
commit 571a54c
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 135 deletions.
diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
     </modules>
     <properties>
         <dokka.version>1.9.20</dokka.version>
-        <kotlin.version>2.0.20</kotlin.version>
+        <kotlin.version>1.9.25</kotlin.version>
         <kotlin-coroutines.version>1.6.2</kotlin-coroutines.version>
         <doclint>none</doclint>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
@@ -60,11 +60,10 @@
         <okhttp3.version>4.12.0</okhttp3.version>
         <ktor.version>2.3.12</ktor.version>
         <kotlin.code.style>official</kotlin.code.style>
-        <kotlin.version>2.0.20</kotlin.version>
         <mock-oauth2-server.version>2.1.9</mock-oauth2-server.version>
         <nimbus.jose.jwt.version>9.40</nimbus.jose.jwt.version>
         <kotest.version>5.9.1</kotest.version>
-        <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
+        <kotlin.compiler.jvmTarget>21</kotlin.compiler.jvmTarget>
     </properties>
     <scm>
         <url>https://github.com/navikt/token-support</url>
@@ -169,22 +168,6 @@
         </plugins>
     </build>
     <profiles>
-        <!--
-        <profile>
-            <id>local</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>3.5.0</version>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>-->
         <profile>
             <id>github</id>
             <activation>
@@ -398,20 +381,27 @@
                 <version>${kotest.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-stdlib-jdk8</artifactId>
-                <version>${kotlin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-test</artifactId>
-                <version>${kotlin.version}</version>
-                <scope>test</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-reflect</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>

diff --git a/token-client-core/pom.xml b/token-client-core/pom.xml
@@ -43,11 +43,6 @@
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-kotlin</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>

diff --git a/token-client-kotlin-demo/pom.xml b/token-client-kotlin-demo/pom.xml
@@ -13,7 +13,6 @@
         <kotlin.code.style>official</kotlin.code.style>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.class>io.ktor.server.netty.EngineMain</main.class>
-        <kotlin.compiler.jvmTarget>21</kotlin.compiler.jvmTarget>
     </properties>
     <dependencies>
         <dependency>
@@ -63,15 +62,6 @@
             <artifactId>token-validation-ktor-v2</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-reflect</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.ktor</groupId>
             <artifactId>ktor-client-core</artifactId>

diff --git a/token-client-spring-demo/pom.xml b/token-client-spring-demo/pom.xml
@@ -52,11 +52,6 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib</artifactId>
-			<version>${kotlin.version}</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>

diff --git a/token-client-spring/pom.xml b/token-client-spring/pom.xml
@@ -9,19 +9,6 @@
 
     <artifactId>token-client-spring</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-reflect</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>no.nav.security</groupId>
             <artifactId>token-validation-core</artifactId>

diff --git a/token-validation-core/pom.xml b/token-validation-core/pom.xml
@@ -31,11 +31,6 @@
             <artifactId>mockwebserver</artifactId>
             <scope>test</scope>
         </dependency>
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib</artifactId>
-			<version>${kotlin.version}</version>
-		</dependency>
     </dependencies>
 	<build>
 		<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>

diff --git a/token-validation-ktor-demo/pom.xml b/token-validation-ktor-demo/pom.xml
@@ -19,16 +19,6 @@
             <artifactId>ktor-client-content-negotiation</artifactId>
             <version>2.2.4</version>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-reflect</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.ktor</groupId>
             <artifactId>ktor-server-auth-jvm</artifactId>
@@ -50,12 +40,6 @@
             <version>${mock-oauth2-server.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test-junit</artifactId>
-            <version>${kotlin.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.ktor</groupId>
             <artifactId>ktor-server-test-host</artifactId>

diff --git a/token-validation-ktor-v2/pom.xml b/token-validation-ktor-v2/pom.xml
@@ -13,16 +13,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>token-validation-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-reflect</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.ktor</groupId>
             <artifactId>ktor-server</artifactId>
@@ -35,12 +25,6 @@
             <version>${ktor.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test-junit5</artifactId>
-            <version>${kotlin.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.ktor</groupId>
             <artifactId>ktor-server-test-host-jvm</artifactId>

diff --git a/token-validation-spring-test/pom.xml b/token-validation-spring-test/pom.xml
@@ -11,11 +11,6 @@
 
     <artifactId>token-validation-spring-test</artifactId>
 
-    <properties>
-        <kotlin.version>2.0.20</kotlin.version>
-    </properties>
-
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -46,17 +41,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test-junit</artifactId>
-            <version>${kotlin.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>

diff --git a/token-validation-spring/pom.xml b/token-validation-spring/pom.xml
@@ -8,26 +8,7 @@
     </parent>
     <artifactId>token-validation-spring</artifactId>
     <name>token-validation-spring</name>
-    <properties>
-        <kotlin.version>2.0.20</kotlin.version>
-    </properties>
     <dependencies>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-reflect</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test-junit</artifactId>
-            <version>${kotlin.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>token-validation-core</artifactId>