From b25116d965c5b9b5c6b7af393bd5bc2800a97d12 Mon Sep 17 00:00:00 2001
From: Diego Tavares <dtavares@imageworks.com>
Date: Wed, 18 Sep 2024 13:39:18 -0700
Subject: [PATCH] Upgrade java and sonarqube-gradle-plugin

---
 .github/workflows/testing-pipeline.yml | 11 +++++++++--
 cuebot/build.gradle                    |  7 +++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/testing-pipeline.yml b/.github/workflows/testing-pipeline.yml
index 014ba8406..5ed08a359 100644
--- a/.github/workflows/testing-pipeline.yml
+++ b/.github/workflows/testing-pipeline.yml
@@ -154,7 +154,14 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
           chown -R aswfuser:aswfgroup .
-          echo JAVA_HOME=$JAVA_HOME
+          export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
+          echo "java -version"
+          java -version
+          echo "which java"
+          which java
+          echo "cuebot/gradlew --version"
           cuebot/gradlew --version
-          su -c "cd cuebot && ./gradlew jacocoTestReport sonarqube -Dsonar.login=$(SONAR_TOKEN)" aswfuser
+          echo "ls /usr/lib/jvm/"
+          ls /usr/lib/jvm/
+          su -c "cd cuebot && ./gradlew jacocoTestReport sonar -Dsonar.login=$(SONAR_TOKEN)" aswfuser
 
diff --git a/cuebot/build.gradle b/cuebot/build.gradle
index 884eb708c..d6973b0d7 100644
--- a/cuebot/build.gradle
+++ b/cuebot/build.gradle
@@ -6,11 +6,14 @@ buildscript {
     repositories {
         mavenCentral()
         jcenter()
+        maven {
+            url = uri("https://plugins.gradle.org/m2/")
+        }
     }
     dependencies {
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.8'
         classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.2.1.RELEASE'
-        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2'
+        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3'
     }
 }
 
@@ -123,7 +126,7 @@ bootJar {
 }
 
 jacoco {
-    toolVersion = "0.8.5"
+    toolVersion = "0.8.12"
 }
 
 jacocoTestReport {