Kotlin 2.0 og spring 3.2.5

Fjernet også ubrukt pakke (kotlin-reflect) og oppgraderte token-support
navikt · May 24, 2024 · 0f9c35b · 0f9c35b
1 parent 9a56687
commit 0f9c35b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.2</version>
+        <version>3.2.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>no.nav.arbeidsgiver</groupId>
@@ -14,9 +14,9 @@
 
     <properties>
         <java.version>21</java.version>
-        <kotlin.version>1.9.22</kotlin.version>
+        <kotlin.version>2.0.0</kotlin.version>
         <cucumber.version>7.15.0</cucumber.version>
-        <token-support.version>4.1.3</token-support.version>
+        <token-support.version>4.1.5</token-support.version>
         <postgres.version>42.7.2</postgres.version>
     </properties>
 
@@ -41,11 +41,6 @@
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-hibernate5-jakarta</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-reflect</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.kafka</groupId>
             <artifactId>spring-kafka</artifactId>
@@ -72,7 +67,7 @@
         <dependency>
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
-            <version>7.3</version>
+            <version>7.4</version>
         </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
@@ -204,7 +199,7 @@
                         <plugin>spring</plugin>
                         <plugin>jpa</plugin>
                     </compilerPlugins>
-                    <languageVersion>1.8</languageVersion>
+                    <languageVersion>2.0</languageVersion>
                 </configuration>
                 <dependencies>
                     <dependency>

diff --git a/src/main/kotlin/no/nav/arbeidsgiver/tiltakrefusjon/featuretoggles/ByEnvironmentStrategy.kt b/src/main/kotlin/no/nav/arbeidsgiver/tiltakrefusjon/featuretoggles/ByEnvironmentStrategy.kt
@@ -7,7 +7,7 @@ import java.util.*
 
 @Component
 class ByEnvironmentStrategy : Strategy {
-    val environment: String
+    final val environment: String = Optional.ofNullable(System.getenv("MILJO")).orElse("local")
     override fun getName(): String {
         return "byEnvironment"
     }
@@ -18,8 +18,4 @@ class ByEnvironmentStrategy : Strategy {
             .map { env: String? -> Arrays.asList(*env!!.split(",").toTypedArray()).contains(environment) }
             .orElse(false)
     }
-
-    init {
-        environment = Optional.ofNullable(System.getenv("MILJO")).orElse("local")
-    }
-}
+}