Merge pull request #29 from OSGP/feature/FDP-2470

FDP-2470: Update dependencies
OSGP · Jul 22, 2024 · 042f1e2 · 042f1e2
2 parents 2cf35dc + a74504f
commit 042f1e2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/application/build.gradle.kts b/application/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     runtimeOnly("org.postgresql:postgresql")
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
-    testImplementation(libs.mockitoKotlin)
+    testImplementation(testLibs.mockitoKotlin)
 
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
@@ -53,11 +53,11 @@ testing {
             useJUnitJupiter()
             dependencies {
                 implementation(project())
+                implementation("org.springframework.boot:spring-boot-starter-test")
+                implementation("org.springframework.boot:spring-boot-starter-data-jpa")
                 implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor")
                 implementation.bundle(libs.bundles.californium)
                 implementation("org.awaitility:awaitility")
-                implementation("org.springframework.boot:spring-boot-starter-test")
-                implementation("org.springframework.boot:spring-boot-starter-data-jpa")
                 runtimeOnly("com.h2database:h2")
             }
         }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 
 plugins {
-    id("org.springframework.boot") version "3.3.0" apply false
+    id("org.springframework.boot") version "3.3.2" apply false
     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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,24 +9,30 @@ include("application")
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
+            version("californium", "3.12.1")
             version("kotlinLogging", "7.0.0")
-            version("mockitoKotlin", "5.3.1")
-            version("californium", "3.8.0")
             version("commons-codec", "1.17.0")
 
+            // https://projects.eclipse.org/projects/iot.californium
             library("californium-core", "org.eclipse.californium", "californium-core").versionRef("californium")
             library("californium-scandium", "org.eclipse.californium", "scandium").versionRef("californium")
             bundle("californium", listOf("californium-core", "californium-scandium"))
 
+            // https://github.com/oshai/kotlin-logging/releases
             library("logging", "io.github.oshai", "kotlin-logging-jvm").versionRef("kotlinLogging")
 
             library("commonsCodec", "commons-codec", "commons-codec").versionRef("commons-codec")
 
-            library(
-                "mockitoKotlin",
-                "org.mockito.kotlin",
-                "mockito-kotlin"
-            ).versionRef("mockitoKotlin")
         }
+      create("testLibs") {
+          version("mockitoKotlin", "5.4.0")
+
+          // https://github.com/mockito/mockito-kotlin/releases
+          library(
+              "mockitoKotlin",
+              "org.mockito.kotlin",
+              "mockito-kotlin"
+          ).versionRef("mockitoKotlin")
+      }
     }
 }