Merge pull request #1000 from galasa-dev/mcobbett-upgrade-protobuf

upgrade protobuf and gson
galasa-dev · Oct 16, 2024 · f7706e1 · f7706e1
2 parents 39eeeef + 89f945c
commit f7706e1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd
@@ -32,15 +32,15 @@ Embed-Dependency: *;scope=compile
     commons-collections4-4.4.jar; lib:=true,\
     commons-lang3-3.14.0.jar; lib:=true,\
     commons-compress-1.26.0.jar; lib:=true,\
-    gson-2.10.jar; lib:=true,\
+    gson-2.10.1.jar; lib:=true,\
     gson-fire-1.8.5.jar; lib:=true,\
     javax.annotation-api-1.3.2.jar; lib:=true,\
     jsr305-3.0.2.jar; lib:=true,\
     kotlin-osgi-bundle-1.7.22.jar; lib:=true,\
     logging-interceptor-4.10.0.jar; lib:=true,\
     okhttp-4.10.0.jar; lib:=true,\
     okio-jvm-3.0.0.jar; lib:=true,\
-    protobuf-java-3.21.10.jar; lib:=true,\
+    protobuf-java-3.25.5.jar; lib:=true,\
     slf4j-api-2.0.5.jar; lib:=true,\
     jose4j-0.9.2.jar; lib:=true,\
     simpleclient-0.15.0.jar; lib:=true,\

diff --git a/...a-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle b/...a-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 description = 'Galasa Kubernetes Manager'
 
-version = '0.34.0'
+version = '0.38.0'
 
 dependencies {
     api project(':galasa-managers-cloud-parent:dev.galasa.cloud.manager')
@@ -22,7 +22,7 @@ dependencies {
     }
     implementation ('com.google.code.gson:gson'){
         version {
-            strictly '2.10'
+            strictly '2.10.1'
         }
     }
     implementation ('org.apache.commons:commons-lang3'){
@@ -45,6 +45,12 @@ dependencies {
             strictly '1.26.0'
         }
     }
+    implementation ('com.google.protobuf:protobuf-java') {
+        version {
+            strictly '3.25.5'
+        }
+    }
+
     implementation 'io.prometheus:simpleclient:0.15.0'
     implementation 'io.prometheus:simpleclient_httpserver:0.15.0'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'

diff --git a/release.yaml b/release.yaml
@@ -133,7 +133,7 @@ managers:
     codecoverage: false
 
   - artifact: dev.galasa.kubernetes.manager
-    version: 0.34.0
+    version: 0.38.0
     obr:          true
     mvp:          true
     bom:          true