Merge branch 'main' into feature/PI-2097-fix-entity-class

ministryofjustice · Jun 6, 2024 · ee2682e · ee2682e
2 parents c6c7140 + f1e1704
commit ee2682e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
     kotlin("jvm") version "2.0.0"
     kotlin("plugin.spring") version "2.0.0" apply false
     kotlin("plugin.jpa") version "2.0.0" apply false
-    id("org.springframework.boot") version "3.2.5" apply false
+    id("org.springframework.boot") version "3.3.0" apply false
     id("io.spring.dependency-management") version "1.1.5" apply false
     id("com.gorylenko.gradle-git-properties") version "2.4.2" apply false
     id("com.google.cloud.tools.jib") apply false

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("com.google.cloud.tools.jib") version "3.4.2" apply false
+    id("com.google.cloud.tools.jib") version "3.4.3" apply false
     id("org.sonarqube") version "5.0.0.4638" apply false
     `kotlin-dsl`
 }

diff --git a/projects/hmpps-auth-and-delius/tech-docs/Gemfile.lock b/projects/hmpps-auth-and-delius/tech-docs/Gemfile.lock
@@ -145,7 +145,8 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
-    rexml (3.2.5)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rouge (3.30.0)
     sass (3.4.25)
     sassc (2.4.0)
@@ -154,6 +155,7 @@ GEM
     sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
+    strscan (3.1.0)
     temple (0.10.0)
     thor (1.2.1)
     tilt (2.0.11)

diff --git a/...ttlement-passport-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/entity/Staff.kt b/...ttlement-passport-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/entity/Staff.kt
@@ -50,6 +50,10 @@ class Staff(
     @Column(name = "last_updated_user_id")
     var lastModifiedUserId: Long = 0,
 
+    @Version
+    @Column(name = "row_version")
+    val version: Long = 0,
+
     @Id
     @Column(name = "staff_id")
     @SequenceGenerator(name = "staff_id_seq", sequenceName = "staff_id_seq", allocationSize = 1)

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -79,11 +79,11 @@ dependencyResolutionManagement {
             library("mockito-kotlin", "org.mockito.kotlin:mockito-kotlin:5.3.1")
             library("mockito-inline", "org.mockito:mockito-inline:5.2.0")
             bundle("mockito", listOf("mockito-kotlin", "mockito-inline"))
-            library("insights", "com.microsoft.azure:applicationinsights-web:3.5.2")
+            library("insights", "com.microsoft.azure:applicationinsights-web:3.5.3")
             library("sentry", "io.sentry:sentry-spring-boot-starter-jakarta:7.9.0")
             library(
                 "opentelemetry-annotations",
-                "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.3.0"
+                "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.4.0"
             )
             bundle("telemetry", listOf("insights", "opentelemetry-annotations", "sentry"))
             library("springdoc", "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0")