CORE-69: gradle to 9.4.1, gradle-git-properties to 2.5.7, junit to 5.14.3

.github/workflows/benchmark.yml

@@ -15,6 +15,10 @@ jobs:
     name: Relative performance benchmarking
     runs-on: ubuntu-latest
 
+    permissions:
+      contents: 'read'
+      id-token: 'write'
+
     steps:
       - uses: actions/checkout@v6
 
@@ -25,6 +29,13 @@ jobs:
           distribution: 'temurin'
           cache: 'gradle'
 
+      - name: Authenticate to GCP
+        uses: google-github-actions/auth@v3
+        with:
+          token_format: access_token
+          workload_identity_provider: 'projects/1038484894585/locations/global/workloadIdentityPools/github-wi-pool/providers/github-wi-provider'
+          service_account: 'dsp-artifact-registry-push@dsp-artifact-registry.iam.gserviceaccount.com'
+
       # Run benchmark via JMH gradle plugin https://github.com/melix/jmh-gradle-plugin
       - name: Run benchmark
         run: |

.github/workflows/build-test-and-publish.yml

@@ -18,6 +18,10 @@ on:
 
 jobs:
   build:
+    permissions:
+      contents: 'read'
+      id-token: 'write'
+
     runs-on: ubuntu-latest
 
     steps:
@@ -28,14 +32,22 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
-
+      - name: Authenticate to GCP
+        uses: google-github-actions/auth@v3
+        with:
+          token_format: access_token
+          workload_identity_provider: 'projects/1038484894585/locations/global/workloadIdentityPools/github-wi-pool/providers/github-wi-provider'
+          service_account: 'dsp-artifact-registry-push@dsp-artifact-registry.iam.gserviceaccount.com'
       - name: Build all projects without running tests
         run: ./gradlew --build-cache build -x test
 
   source-clear:
     needs: [ build ]
     runs-on: ubuntu-latest
 
+    permissions:
+      contents: 'read'
+      id-token: 'write'
     steps:
       - uses: actions/checkout@v6
       - name: Set up JDK
@@ -44,7 +56,12 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
-
+      - name: Authenticate to GCP
+        uses: google-github-actions/auth@v3
+        with:
+          token_format: access_token
+          workload_identity_provider: 'projects/1038484894585/locations/global/workloadIdentityPools/github-wi-pool/providers/github-wi-provider'
+          service_account: 'dsp-artifact-registry-push@dsp-artifact-registry.iam.gserviceaccount.com'
       - name: SourceClear scan
         env:
           SRCCLR_API_TOKEN: ${{ secrets.SRCCLR_API_TOKEN }}
@@ -53,6 +70,9 @@ jobs:
   unit-tests-and-sonarqube:
     needs: [ build ]
     runs-on: ubuntu-latest
+    permissions:
+      contents: 'read'
+      id-token: 'write'
     steps:
       - uses: actions/checkout@v6
         # Needed by sonar to get the git history for the branch the PR will be merged into.
@@ -64,6 +84,12 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
+      - name: Authenticate to GCP
+        uses: google-github-actions/auth@v3
+        with:
+          token_format: access_token
+          workload_identity_provider: 'projects/1038484894585/locations/global/workloadIdentityPools/github-wi-pool/providers/github-wi-provider'
+          service_account: 'dsp-artifact-registry-push@dsp-artifact-registry.iam.gserviceaccount.com'
       - name: Test with coverage
         run: ./gradlew --build-cache test jacocoTestReport --scan
       - name: SonarQube scan for library

buildSrc/build.gradle

@@ -9,8 +9,8 @@ repositories {
 dependencies {
     implementation 'com.diffplug.spotless:spotless-plugin-gradle:8.4.0'
     implementation 'com.srcclr.gradle:com.srcclr.gradle.gradle.plugin:3.1.12'
-    implementation 'org.sonarqube:org.sonarqube.gradle.plugin:4.4.1.3373'
+    implementation 'org.sonarqube:org.sonarqube.gradle.plugin:5.1.0.4882'
     implementation 'info.picocli:picocli:4.7.7'
-    implementation 'com.gorylenko.gradle-git-properties:gradle-git-properties:2.4.1'
+    implementation 'com.gorylenko.gradle-git-properties:gradle-git-properties:2.5.7'
     implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:6.0.4'
 }

buildSrc/src/main/groovy/bio.terra.pfb.java-common-conventions.gradle

@@ -9,7 +9,7 @@ plugins {
 
 boolean isCiServer = System.getenv().containsKey("CI")
 ext {
-    junit_version = '5.10.0'
+    junit_version = '5.14.3'
     mockito_version = '5.5.0'
 }
 
@@ -22,9 +22,9 @@ java {
 dependencies {
     testImplementation 'org.hamcrest:hamcrest:2.2'
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+    testImplementation("org.junit.jupiter:junit-jupiter:$junit_version")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+
     testImplementation "org.mockito:mockito-core:$mockito_version"
     testImplementation "org.mockito:mockito-junit-jupiter:$mockito_version"
 }

cli/build.gradle

@@ -6,7 +6,7 @@ application {
     mainClass = 'bio.terra.pfb.JavaPfbCommand'
 }
 
-version gradle.releaseVersion
+version = gradle.releaseVersion
 apply from: "generators.gradle"
 
 repositories {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

library/build.gradle

@@ -4,17 +4,17 @@ plugins {
     id 'bio.terra.pfb.java-library-conventions'
     id 'com.github.davidmc24.gradle.plugin.avro' version '1.9.1'
     id 'me.champeau.jmh' version '0.7.3'
-    id 'com.google.cloud.artifactregistry.gradle-plugin' version '2.1.5'
+    id 'com.google.cloud.artifactregistry.gradle-plugin' version '2.2.5'
 }
 
 repositories {
     maven {
         // Terra proxy for maven central
-        url 'https://us-central1-maven.pkg.dev/dsp-artifact-registry/maven-central/'
+        url = 'https://us-central1-maven.pkg.dev/dsp-artifact-registry/maven-central/'
     }
     mavenCentral()
     maven {
-        url 'https://us-central1-maven.pkg.dev/dsp-artifact-registry/libs-release/'
+        url = 'https://us-central1-maven.pkg.dev/dsp-artifact-registry/libs-release/'
     }
 }
 

library/src/test/java/bio/terra/pfb/utils/CompareOutputUtils.java

@@ -13,11 +13,8 @@
 import java.nio.file.Paths;
 import java.util.List;
 import org.skyscreamer.jsonassert.JSONAssert;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class CompareOutputUtils {
-  private static final Logger logger = LoggerFactory.getLogger(CompareOutputUtils.class);
 
   public static void assertJavaPfbIsPyPFB(
       String fileName, PfbCommandType commandType, String filePath, FileExtension fileExtension)