Merge pull request #23 from OSGP/feature/FDP-2665-dependency-updates

Feature/fdp 2665 dependency updates
OSGP · Oct 9, 2024 · 5024032 · 5024032
2 parents 1146ce0 + e9d2116
commit 5024032
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,10 +6,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.net.URI
 
 plugins {
-    id("io.spring.dependency-management") version "1.1.5" apply false
-    kotlin("jvm") version "2.0.0" apply false
-    kotlin("plugin.spring") version "2.0.0" apply false
-    id("org.sonarqube") version "5.0.0.4638"
+    id("io.spring.dependency-management") version "1.1.6" apply false
+    kotlin("jvm") version "2.0.20" apply false
+    kotlin("plugin.spring") version "2.0.20" apply false
+    id("org.sonarqube") version "5.1.0.4882"
     id("com.diffplug.spotless") version("6.25.0")
 }
 
@@ -45,7 +45,7 @@ subprojects {
 
     extensions.configure<StandardDependencyManagementExtension> {
         imports {
-            mavenBom("org.springframework.boot:spring-boot-dependencies:3.3.1")
+            mavenBom("org.springframework.boot:spring-boot-dependencies:3.3.4")
         }
     }
 
@@ -63,7 +63,6 @@ subprojects {
         }
     }
 
-
     extensions.configure<SpotlessExtension> {
         kotlin {
             // by default the target is every '.kt' and '.kts' file in the java source sets
@@ -96,6 +95,11 @@ subprojects {
         }
     }
 
+    tasks.register<DependencyReportTask>("dependenciesAll"){
+        description = "Displays all dependencies declared in all sub projects"
+        group = "help"
+    }
+
     tasks.withType<Test> {
         useJUnitPlatform()
     }

diff --git a/oauth-token-client/build.gradle.kts b/oauth-token-client/build.gradle.kts
@@ -19,7 +19,12 @@ testing {
             dependencies {
                 implementation(project())
                 implementation("org.springframework.boot:spring-boot-starter-test")
-                implementation(testLibs.mockServer)
+                implementation(testLibs.mockServer) {
+                    // CVE fixes
+                    exclude(group = "org.bouncycastle", module = "bcpkix-jdk18on")
+                    exclude(group = "org.bouncycastle", module = "bcprov-jdk18on")
+                    exclude(group = "org.bouncycastle", module = "bcutil-jdk18on")
+                }
             }
         }
     }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -4,7 +4,7 @@
 
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
 rootProject.name = "gxf-java-utilities"
@@ -18,14 +18,14 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             version("avro", "1.12.0")
-            version("msal4j", "1.16.1")
+            version("msal4j", "1.17.2")
 
             library("avro", "org.apache.avro", "avro").versionRef("avro")
             library("msal", "com.microsoft.azure", "msal4j").versionRef("msal4j")
         }
 
         create("testLibs") {
-            version("mockitoKotlin", "5.1.0")
+            version("mockitoKotlin", "5.4.0")
             version("mockServer", "5.15.0")
 
             library("mockitoKotlin", "org.mockito.kotlin", "mockito-kotlin").versionRef("mockitoKotlin")