From 0d92e440b0ca181da47f5a6895a1464ed7e90a69 Mon Sep 17 00:00:00 2001
From: CrowleyRajapakse <srrajapakse1@gmail.com>
Date: Wed, 2 Oct 2024 11:04:37 +0530
Subject: [PATCH] upgrading dependencies ralted to trivy scan issues

---
 adapter/Dockerfile           | 6 +++---
 common-controller/Dockerfile | 6 +++---
 gateway/enforcer/Dockerfile  | 6 +++---
 libs.versions.toml           | 4 ++--
 ratelimiter/Dockerfile       | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/adapter/Dockerfile b/adapter/Dockerfile
index e0e8a21ab7..e9a1e7f674 100644
--- a/adapter/Dockerfile
+++ b/adapter/Dockerfile
@@ -24,8 +24,8 @@ ENV LANG=C.UTF-8
 
 ARG APK_USER=wso2
 ARG APK_USER_ID=10001
-ARG CHECKSUM_AMD64="d14037ad94518eac8dbe57c146d6c2ca808f7f32600ee0c4057ef4b03ee0e42e"
-ARG CHECKSUM_ARM64="dc1b96c23b6befe946516ffd2c57c9bb20d0fc8a6f6b652298a7b97cc5de4d31"
+ARG CHECKSUM_AMD64="3ddaf85583613c97693e9b8aaa251dac07e73e366e159a7ccadbcf553117fcef"
+ARG CHECKSUM_ARM64="5e17ff4c055f075b58a1cd7ec37843d989cd0072340222a4fd0730773382027e"
 ARG APK_USER_GROUP=wso2
 ARG APK_USER_GROUP_ID=10001
 ARG APK_USER_HOME=/home/${APK_USER}
@@ -47,7 +47,7 @@ RUN \
     && echo '[ ! -z "${TERM}" -a -r /etc/motd ] && cat /etc/motd' >> /etc/bash.bashrc; echo "${MOTD}" > /etc/motd
 
 RUN \
-    wget -q https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.4.25/grpc_health_probe-linux-${TARGETARCH} \
+    wget -q https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.4.34/grpc_health_probe-linux-${TARGETARCH} \
     && mv grpc_health_probe-linux-${TARGETARCH} ${GRPC_HEALTH_PROBE_PATH} \
     && if [ "${TARGETARCH}" = "amd64" ]; then echo "${CHECKSUM_AMD64}  ${GRPC_HEALTH_PROBE_PATH}" | sha256sum -c -; fi
     
diff --git a/common-controller/Dockerfile b/common-controller/Dockerfile
index b4431cb05c..44c435c5da 100644
--- a/common-controller/Dockerfile
+++ b/common-controller/Dockerfile
@@ -25,8 +25,8 @@ ENV LANG=C.UTF-8 KUBERNETES_SERVICE_PORT=8443 KUBERNETES_SERVICE_HOST=192.168.49
 
 ARG APK_USER=wso2
 ARG APK_USER_ID=10001
-ARG CHECKSUM_AMD64="d14037ad94518eac8dbe57c146d6c2ca808f7f32600ee0c4057ef4b03ee0e42e"
-ARG CHECKSUM_ARM64="dc1b96c23b6befe946516ffd2c57c9bb20d0fc8a6f6b652298a7b97cc5de4d31"
+ARG CHECKSUM_AMD64="3ddaf85583613c97693e9b8aaa251dac07e73e366e159a7ccadbcf553117fcef"
+ARG CHECKSUM_ARM64="5e17ff4c055f075b58a1cd7ec37843d989cd0072340222a4fd0730773382027e"
 ARG APK_USER_GROUP=wso2
 ARG APK_USER_GROUP_ID=10001
 ARG APK_USER_HOME=/home/${APK_USER}
@@ -50,7 +50,7 @@ RUN \
     && echo '[ ! -z "${TERM}" -a -r /etc/motd ] && cat /etc/motd' >> /etc/bash.bashrc; echo "${MOTD}" > /etc/motd
 
 RUN \
-    wget -q https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.4.25/grpc_health_probe-linux-${TARGETARCH} \
+    wget -q https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.4.34/grpc_health_probe-linux-${TARGETARCH} \
     && mv grpc_health_probe-linux-${TARGETARCH} ${GRPC_HEALTH_PROBE_PATH} \
     && if [ "${TARGETARCH}" = "amd64" ]; then echo "${CHECKSUM_AMD64}  ${GRPC_HEALTH_PROBE_PATH}" | sha256sum -c -; fi
     
diff --git a/gateway/enforcer/Dockerfile b/gateway/enforcer/Dockerfile
index e803dd8099..66b7e9a934 100644
--- a/gateway/enforcer/Dockerfile
+++ b/gateway/enforcer/Dockerfile
@@ -72,8 +72,8 @@ ARG APK_VERSION=1.0-SNAPSHOT
 ENV VERSION=${APK_VERSION}
 ENV JAVA_OPTS=""
 ENV ENFORCER_HOME=${APK_USER_HOME}
-ARG CHECKSUM_AMD64="7e564681110ee4563637457b91e42f62f96b79618a835bb05ae2305acdcc3db0"
-ARG CHECKSUM_ARM64="3759148e22a494149a4abae269adee0d20c428b966683426e2319f9047da521d"
+ARG CHECKSUM_AMD64="3ddaf85583613c97693e9b8aaa251dac07e73e366e159a7ccadbcf553117fcef"
+ARG CHECKSUM_ARM64="5e17ff4c055f075b58a1cd7ec37843d989cd0072340222a4fd0730773382027e"
 ENV ENFORCER_PRIVATE_KEY_PATH=/home/wso2/security/keystore/mg.key
 ENV ENFORCER_PUBLIC_CERT_PATH=/home/wso2/security/keystore/mg.pem
 ENV TRUSTED_CA_CERTS_PATH=/home/wso2/security/truststore
@@ -105,7 +105,7 @@ RUN \
     && echo '[ ! -z "${TERM}" -a -r /etc/motd ] && cat /etc/motd' >> /etc/bash.bashrc; echo "${MOTD}" > /etc/motd
 
 RUN \
-    wget -q https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.4.24/grpc_health_probe-linux-${TARGETARCH} \
+    wget -q https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.4.34/grpc_health_probe-linux-${TARGETARCH} \
     && mv grpc_health_probe-linux-${TARGETARCH} ${GRPC_HEALTH_PROBE_PATH}\
     && if [ "${TARGETARCH}" = "amd64" ]; then echo "${CHECKSUM_AMD64}  ${GRPC_HEALTH_PROBE_PATH}" | sha256sum -c -; fi
 
diff --git a/libs.versions.toml b/libs.versions.toml
index 09438644cc..dae3ffec4b 100644
--- a/libs.versions.toml
+++ b/libs.versions.toml
@@ -137,7 +137,7 @@ envoyproxy = "1.0.46"
 fasterxml-woodstox="6.4.0"
 everit = "1.5.0.wso2.v2"
 geronimo = "1.1.1.wso2v1"
-graphql = "21.1"
+graphql = "22.3"
 grpc = "1.62.2"
 gson = "2.10"
 guava = "32.1.2-jre"
@@ -182,7 +182,7 @@ wso2-uri-templates = "1.6.5"
 xerces = "2.8.1.wso2v2"
 #Added as direct dependency for transitive dependency version upgrades
 reactor-netty-http = "1.0.39"
-protobuf-java = "3.21.7"
+protobuf-java = "3.25.5"
 #Test dependencies
 hamcrest = "1.3"
 jacoco = "0.8.4"
diff --git a/ratelimiter/Dockerfile b/ratelimiter/Dockerfile
index 881a394957..0722d5183c 100644
--- a/ratelimiter/Dockerfile
+++ b/ratelimiter/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 # -----------------------------------------------------------------------
 
-FROM envoyproxy/ratelimit:19f2079f
+FROM envoyproxy/ratelimit:28b1629a
 LABEL maintainer="WSO2 Docker Maintainers <wso2.com>"
 
 RUN apk update && apk upgrade --no-cache