Merge branch 'master' into snyk-upgrade-568985fa028908b93a3a2f4eb425fa49

.github/workflows/docker-publish.yml

@@ -52,7 +52,7 @@ jobs:
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
         if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@b18d21aaa20ef40c4e681202a598b7591d5be577
+        uses: sigstore/cosign-installer@e1523de7571e31dbe865fd2e80c5c7c23ae71eb4
         with:
           cosign-release: 'v1.13.1'
       # Build Quarkus
@@ -84,7 +84,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@94d76d3bc1409736cb5dc1ada9502bec3a72973c
+        uses: docker/build-push-action@4976231911ebf5f32aad765192d35f942aa48cb8
         with:
           context: ./github-bot/
           push: ${{ github.event_name != 'pull_request' }}

.github/workflows/qodana-cloud.yml

@@ -15,6 +15,6 @@ jobs:
         uses: JetBrains/qodana-action@e42ff2d2727091337983f607598abbbce4e25f1f # v2023.3.1
         env:
           QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
-      - uses: github/codeql-action/upload-sarif@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3
+      - uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3
         with:
           sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json

.github/workflows/test.yml

@@ -1,25 +1,32 @@
-name: Unit Tests
+name: Code Quality Checks
 on:
   workflow_dispatch:
   pull_request:
   push:
     branches:
-      - main
+      - master
       - 'releases/*'
 
 jobs:
+  run-spotless:
+    uses: martinwitt/unreusable-workflows/.github/workflows/spotless-gradle.yaml@master
+    with:
+      java-version: '21'
+      distribution: 'oracle'
+      working-dir: './'
+  qodana-scan:
+    permissions:
+      security-events: write
+    uses: martinwitt/unreusable-workflows/.github/workflows/qodana-scan.yaml@master
   junit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-        with:
-          fetch-depth: 0
-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # v3
-      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
-        with:
-          java-version: 21
-          distribution: oracle
-      - name: Run Tests
-        run: |
-          gradle test
+    uses: martinwitt/unreusable-workflows/.github/workflows/gradle-tests.yaml@master
+    with:
+      java-version: '21'
+      distribution: 'oracle'
+      working-dir: './'
+  build:
+    uses: martinwitt/unreusable-workflows/.github/workflows/gradle-build.yaml@master
+    with:
+      java-version: '21'
+      distribution: 'oracle'
+      working-dir: './'

buildSrc/src/main/groovy/xyz.keksdose.spoon.code_solver.java-common-conventions.gradle

@@ -11,14 +11,14 @@ repositories {
 }
 dependencies {
 		// Use JUnit Jupiter for testing.
-	testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+	testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 	implementation 'com.google.guava:guava:33.0.0-jre'
 	implementation 'fr.inria.gforge.spoon:spoon-core:10.4.2'
 	implementation 'com.google.flogger:flogger:0.8'
 	implementation 'com.google.flogger:flogger-system-backend:0.8'
 	implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.4.14'
 	errorprone("com.google.errorprone:error_prone_core:2.24.1")
-	testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.2'
+	testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.3'
 	annotationProcessor "com.uber.nullaway:nullaway:+"
 	testImplementation "org.instancio:instancio-junit:4.1.0"
 }

code-transformation/build.gradle

@@ -15,11 +15,11 @@ dependencies {
 	implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.8.0.202311291450-r'
 	implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit.ssh.apache', version: '6.8.0.202311291450-r'
     implementation project(path: ':matcher')
-	testImplementation "com.google.truth:truth:1.3.0"
+	testImplementation "com.google.truth:truth:1.4.0"
 	implementation "com.github.docker-java:docker-java-core:+"
 	implementation "com.github.docker-java:docker-java-transport-httpclient5:+"
 	implementation "com.contrastsecurity:java-sarif:+"
-	testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.2'
+	testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.3'
 	implementation project(":commons")
 	implementation 'io.github.java-diff-utils:java-diff-utils:4.12'
 }

code-transformation/src/main/java/xyz/keksdose/spoon/code_solver/analyzer/spoon/SpoonBasedAnalyzer.java

@@ -2,19 +2,18 @@
 
 import com.google.common.flogger.FluentLogger;
 import io.github.martinwitt.laughing_train.domain.entity.AnalyzerResult;
-import spoon.Launcher;
-import spoon.SpoonAPI;
-import spoon.reflect.CtModel;
-import spoon.reflect.declaration.CtType;
-import xyz.keksdose.spoon.code_solver.analyzer.spoon.api.SpoonRules;
-
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import spoon.Launcher;
+import spoon.SpoonAPI;
+import spoon.reflect.CtModel;
+import spoon.reflect.declaration.CtType;
+import xyz.keksdose.spoon.code_solver.analyzer.spoon.api.SpoonRules;
 
 public class SpoonBasedAnalyzer {