Merge pull request #14 from OSGP/feature/java-21

FDP-1891: Upgrade Proxy IT to Java 21 and Spring Boot 3.2
OSGP · Jan 11, 2024 · 8803fc2 · 8803fc2
2 parents 3eed09a + 0ba71ed
commit 8803fc2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/application/build.gradle.kts b/application/build.gradle.kts
@@ -14,8 +14,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-logging")
     implementation("org.springframework.kafka:spring-kafka")
     implementation("com.gxf.utilities:kafka-azure-oauth:0.2")
-    implementation("com.microsoft.azure:msal4j:1.13.10")
-    implementation("org.apache.httpcomponents:httpclient:4.5.13") {
+    implementation("org.apache.httpcomponents:httpclient:4.5.14") {
         exclude("commons-logging")
     }
     implementation(kotlin("reflect"))
@@ -58,9 +57,7 @@ testing {
                 implementation("org.springframework.kafka:spring-kafka-test")
                 implementation("org.assertj:assertj-core")
                 implementation("org.springframework.boot:spring-boot-starter-webflux")
-                implementation("org.wiremock:wiremock:3.3.1")
-
-                implementation("org.testcontainers:kafka:1.17.6")
+                implementation("org.wiremock:wiremock-standalone:3.3.1")
             }
         }
     }

diff --git a/application/src/main/resources/application.yaml b/application/src/main/resources/application.yaml
@@ -8,6 +8,9 @@ spring:
   kafka:
     consumer:
       group-id: gxf-soap-bridge
+  threads:
+    virtual:
+      enabled: true
 
 soap:
   hostname-verification-strategy: BROWSER_COMPATIBLE_HOSTNAMES

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,13 +4,13 @@ import io.spring.gradle.dependencymanagement.internal.dsl.StandardDependencyMana
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.springframework.boot") version "3.1.6" apply false
-    id("io.spring.dependency-management") version "1.1.3" apply false
-    kotlin("jvm") version "1.9.10" apply false
-    kotlin("plugin.spring") version "1.9.10" apply false
-    kotlin("plugin.jpa") version "1.9.10" apply false
-    id("com.github.davidmc24.gradle.plugin.avro") version "1.8.0" apply false
-    id("org.sonarqube") version "4.2.1.3168"
+    id("org.springframework.boot") version "3.2.1" apply false
+    id("io.spring.dependency-management") version "1.1.4" apply false
+    kotlin("jvm") version "1.9.22" apply false
+    kotlin("plugin.spring") version "1.9.22" apply false
+    kotlin("plugin.jpa") version "1.9.22" apply false
+    id("com.github.davidmc24.gradle.plugin.avro") version "1.9.1" apply false
+    id("org.sonarqube") version "4.4.1.3373"
     id("eclipse")
 }
 
@@ -23,7 +23,6 @@ sonarqube {
         property("sonar.organization", "gxf")
     }
 }
-tasks.sonar
 
 subprojects {
     apply(plugin = "org.jetbrains.kotlin.jvm")
@@ -51,7 +50,7 @@ subprojects {
 
     extensions.configure<JavaPluginExtension> {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(17))
+            languageVersion.set(JavaLanguageVersion.of(21))
         }
     }
 
@@ -64,7 +63,7 @@ subprojects {
     tasks.withType<KotlinCompile> {
         kotlinOptions {
             freeCompilerArgs = listOf("-Xjsr305=strict")
-            jvmTarget = "17"
+            jvmTarget = "21"
         }
     }