Revert "Add java matrix to GHA (#725)" (#727)

This reverts commit 16672a9.

Author: Michael1142

.github/dependabot.yml

@@ -11,15 +11,12 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [21, 23]
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-java@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: ${{ matrix.java }}
+          java-version: '17'
           cache: 'gradle'
       - name: Build
-        run: ./gradlew check -PjavaVersion=${{ matrix.java }}
+        run: ./gradlew check

.github/workflows/ci.yml

@@ -12,41 +12,39 @@
 name: "CodeQL"
 
 on:
+  push:
+    branches: [ "master" ]
   pull_request:
-    branches:
-      - master
-      - main
-
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
   schedule:
     - cron: '36 5 * * 4'
+
 jobs:
   analyze:
-    name: Analyze (Java ${{ matrix.java }})
+    name: Analyze
     runs-on: ubuntu-latest
     permissions:
       actions: read
       contents: read
       security-events: write
-    env:
-      ORG_GRADLE_PROJECT_javaVersion: ${{ matrix.java }}
 
     strategy:
       fail-fast: false
       matrix:
         language: [ 'java' ]
-        java: [21, 23]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Use only 'java' to analyze code written in Java, Kotlin or both
         # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,16 +54,16 @@ jobs:
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
-    - uses: actions/setup-java@v5
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin' # See 'Supported distributions' for available options
-        java-version: ${{ matrix.java }}
+        java-version: '17'
 
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v4
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -78,6 +76,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/codeql.yml

@@ -2,8 +2,7 @@ name: Publish OpenAPI specs
 on:
   push:
     branches:
-      - master
-      - main
+      - "master"
 
 jobs:
   publish-openapi:
@@ -12,4 +11,4 @@ jobs:
       SWAGGER_PUBLISHER_API_TOKEN: ${{ secrets.SWAGGER_PUBLISHER_API_TOKEN }}
     with:
       test_to_run: 'uk.gov.hmcts.reform.demo.openapi.OpenAPIPublisherTest'
-      java_version: 21
+      java_version: 17

.github/workflows/publish-openapi.yaml

@@ -89,16 +89,6 @@ The template contains the following plugins:
 
 Located in `./bin/init.sh`. Simply run and follow the explanation how to execute it.
 
-## Java version
-
-The HMCTS Java plugin configures the Gradle toolchain using the `javaVersion` project property.
-This template defaults to Java 21, so no extra flag is needed for local development. When you want
-to be explicit (for example in CI), pass the property on the command line, e.g.
-
-```bash
-./gradlew check -PjavaVersion=21
-```
-
 ## Building and deploying the application
 
 ### Building the application
@@ -184,3 +174,4 @@ There is no need to remove postgres and java or similar core images.
 ## License
 
 This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details
+

.github/workflows/secrets-scanner.yml

@@ -3,7 +3,7 @@ plugins {
   id 'jacoco'
   id 'io.spring.dependency-management' version '1.1.7'
   id 'org.springframework.boot' version '3.5.5'
-  id 'com.github.ben-manes.versions' version '0.53.0'
+  id 'com.github.ben-manes.versions' version '0.52.0'
   id 'org.sonarqube' version '6.3.1.5724'
   /*
     Applies analysis tools including checkstyle and OWASP Dependency checker.
@@ -20,9 +20,7 @@ application {
 
 java {
   toolchain {
-    languageVersion = JavaLanguageVersion.of(
-      findProperty("javaVersion")?.toInteger() ?: 21
-    )
+    languageVersion = JavaLanguageVersion.of(21)
   }
 }
 
@@ -42,15 +40,12 @@ def configureSourceSet(String name) {
 configurations {
   functionalTestImplementation.extendsFrom testImplementation
   functionalTestRuntimeOnly.extendsFrom runtimeOnly
-  functionalTestRuntimeOnly.extendsFrom testRuntimeOnly
 
   integrationTestImplementation.extendsFrom testImplementation
   integrationTestRuntimeOnly.extendsFrom runtimeOnly
-  integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
 
   smokeTestImplementation.extendsFrom testImplementation
   smokeTestRuntimeOnly.extendsFrom runtimeOnly
-  smokeTestRuntimeOnly.extendsFrom testRuntimeOnly
 }
 
 tasks.withType(JavaCompile).configureEach {
@@ -138,8 +133,8 @@ repositories {
 }
 
 ext {
-  log4JVersion = "2.25.2"
-  logbackVersion = "1.5.19"
+  log4JVersion = "2.25.1"
+  logbackVersion = "1.5.18"
 }
 
 ext['snakeyaml.version'] = '2.0'
@@ -160,7 +155,6 @@ dependencies {
 
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
   testImplementation group: 'io.rest-assured', name: 'rest-assured', version: '5.5.6'
-  testRuntimeOnly group: 'org.junit.platform', name: 'junit-platform-launcher'
 }
 
 bootJar {

README.md

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