From 87d2b3065c750aaca48a5e70f64e35ac26bd7e5a Mon Sep 17 00:00:00 2001
From: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com>
Date: Wed, 6 Aug 2025 13:56:09 +0000
Subject: [PATCH 1/2] sonarqube/25.8.0.112029 package update

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

diff --git a/sonarqube.yaml b/sonarqube.yaml
index df29ace4e2a..97599e69d61 100644
--- a/sonarqube.yaml
+++ b/sonarqube.yaml
@@ -1,7 +1,7 @@
 package:
   name: sonarqube
-  version: "25.7.0.110598"
-  epoch: 2
+  version: "25.8.0.112029"
+  epoch: 0
   description: SonarQube is an open source platform for continuous inspection of code quality (Community Build)
   copyright:
     - license: LGPL-3.0-or-later
@@ -40,7 +40,7 @@ pipeline:
     with:
       repository: https://github.com/SonarSource/sonarqube
       tag: ${{package.version}}
-      expected-commit: 015eb1ed5885f7618f674dbf2321871de0f761fb
+      expected-commit: 55e9e22158755f804d60d885c3473bd0f6962505
 
   - uses: patch
     with:

From 2413ef2e2c66f706708591e4f7ce2894c4111df9 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@chainguard.dev>
Date: Fri, 8 Aug 2025 10:42:08 -0400
Subject: [PATCH 2/2] sonarqube: drop remediation patch, applied upstream

---
 sonarqube.yaml                                  |  4 ----
 sonarqube/GHSA-hq9p-pm7w-8p54-remediation.patch | 11 -----------
 2 files changed, 15 deletions(-)
 delete mode 100644 sonarqube/GHSA-hq9p-pm7w-8p54-remediation.patch

diff --git a/sonarqube.yaml b/sonarqube.yaml
index 97599e69d61..1d437cd4467 100644
--- a/sonarqube.yaml
+++ b/sonarqube.yaml
@@ -42,10 +42,6 @@ pipeline:
       tag: ${{package.version}}
       expected-commit: 55e9e22158755f804d60d885c3473bd0f6962505
 
-  - uses: patch
-    with:
-      patches: GHSA-hq9p-pm7w-8p54-remediation.patch
-
   - name: build
     runs: |
       ./gradlew build -x test -DbuildNumber=${{vars.build-number}} # skipping tests as some tests fail, seemingly due to filesystem particularities
diff --git a/sonarqube/GHSA-hq9p-pm7w-8p54-remediation.patch b/sonarqube/GHSA-hq9p-pm7w-8p54-remediation.patch
deleted file mode 100644
index 701173cd174..00000000000
--- a/sonarqube/GHSA-hq9p-pm7w-8p54-remediation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build.gradle
-+++ b/build.gradle
-@@ -507,7 +507,7 @@ subprojects {
-         entry 'log4j-over-slf4j'
-         entry 'slf4j-api'
-       }
--      dependency 'org.postgresql:postgresql:42.7.6'
-+      dependency 'org.postgresql:postgresql:42.7.7'
-       dependency 'org.reflections:reflections:0.10.2'
-       dependency 'org.simpleframework:simple:5.1.6'
-       dependency 'org.sonarsource.git.blame:git-files-blame:2.0.0.2053'
\ No newline at end of file