From 67ea9a88cfb9c485ab61e9a34053b337d0ad7ea5 Mon Sep 17 00:00:00 2001
From: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com>
Date: Mon, 4 Mar 2024 10:49:38 +0000
Subject: [PATCH 1/3] keycloak/24.0.0 package update

Signed-off-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com>
---
 keycloak.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keycloak.yaml b/keycloak.yaml
index 0c0b550f3ed..9f562225cf5 100644
--- a/keycloak.yaml
+++ b/keycloak.yaml
@@ -1,6 +1,6 @@
 package:
   name: keycloak
-  version: 23.0.7
+  version: 24.0.0
   epoch: 0
   description: Open Source Identity and Access Management For Modern Applications and Services
   copyright:
@@ -30,7 +30,7 @@ pipeline:
     with:
       repository: https://github.com/keycloak/keycloak
       tag: ${{package.version}}
-      expected-commit: 4ba4d536a9ee233a3c7655b5824ba50213e810b2
+      expected-commit: a43d7b1cd6fe713e491aafdc8c618721d34f10e6
 
   - uses: patch
     with:

From c2e5f990b79f806a17d9e04d28655039bd24f6e1 Mon Sep 17 00:00:00 2001
From: Ajay Kemparaj <ajaykemparaj@gmail.com>
Date: Mon, 4 Mar 2024 04:02:00 -0800
Subject: [PATCH 2/3] Update keycloak.yaml

---
 keycloak.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/keycloak.yaml b/keycloak.yaml
index 9f562225cf5..377b30b75c5 100644
--- a/keycloak.yaml
+++ b/keycloak.yaml
@@ -32,10 +32,6 @@ pipeline:
       tag: ${{package.version}}
       expected-commit: a43d7b1cd6fe713e491aafdc8c618721d34f10e6
 
-  - uses: patch
-    with:
-      patches: GHSA-24rp-q3w6-vc56.patch
-
   - runs: |
       # Keycloak installation. Note we use the maven wrapper as configured in
       # the source repo to build - ensures the correct maven version for

From 00305f845042193272f3404069041dfb142e372a Mon Sep 17 00:00:00 2001
From: ajayk <ajaykemparaj@gmail.com>
Date: Mon, 4 Mar 2024 09:24:13 -0500
Subject: [PATCH 3/3] cleanup patch files

---
 keycloak/GHSA-24rp-q3w6-vc56.patch | 44 ------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 keycloak/GHSA-24rp-q3w6-vc56.patch

diff --git a/keycloak/GHSA-24rp-q3w6-vc56.patch b/keycloak/GHSA-24rp-q3w6-vc56.patch
deleted file mode 100644
index c527138d255..00000000000
--- a/keycloak/GHSA-24rp-q3w6-vc56.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index a25b4d0f5b..7a6a6c7d05 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -158,7 +158,7 @@
-         <mysql.version>8.0</mysql.version>
-         <mysql-jdbc.version>8.0.33</mysql-jdbc.version>
-         <postgresql.version>15</postgresql.version>
--        <postgresql-jdbc.version>42.6.0</postgresql-jdbc.version>
-+        <postgresql-jdbc.version>42.6.1</postgresql-jdbc.version>
-         <mariadb.version>10.11</mariadb.version>
-         <mariadb-jdbc.version>3.1.4</mariadb-jdbc.version>
-         <mssql.version>2022-latest</mssql.version>
-diff --git a/quarkus/pom.xml b/quarkus/pom.xml
-index 58a66217f5..896b37a45f 100644
---- a/quarkus/pom.xml
-+++ b/quarkus/pom.xml
-@@ -56,6 +56,11 @@
-                 <artifactId>infinispan-client-hotrod-jakarta</artifactId>
-                 <version>${infinispan.version}</version>
-             </dependency>
-+            <dependency>
-+                <groupId>org.postgresql</groupId>
-+                <artifactId>postgresql</artifactId>
-+                <version>${postgresql-jdbc.version}</version>
-+            </dependency>
-         </dependencies>
-     </dependencyManagement>
- 
-diff --git a/quarkus/server/pom.xml b/quarkus/server/pom.xml
-index 774b0f362b..6e4a06dfb4 100644
---- a/quarkus/server/pom.xml
-+++ b/quarkus/server/pom.xml
-@@ -23,6 +23,10 @@
-             <groupId>com.fasterxml.jackson.core</groupId>
-             <artifactId>jackson-databind</artifactId>
-         </dependency>
-+        <dependency>
-+            <groupId>org.postgresql</groupId>
-+            <artifactId>postgresql</artifactId>
-+        </dependency>
-         <dependency>
-             <groupId>com.fasterxml.jackson.core</groupId>
-             <artifactId>jackson-core</artifactId>