diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00adb4b7..402ebb79 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Template CI +name: Java CI on: pull_request: @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' # See 'Supported distributions' for available options - java-version: '17' + java-version: '21' cache: 'gradle' - name: Build run: ./gradlew check diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 73a369ba..5cc7af52 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -57,7 +57,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' # See 'Supported distributions' for available options - java-version: '17' + java-version: '21' # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). diff --git a/.github/workflows/publish-openapi.yaml b/.github/workflows/publish-openapi.yaml index 015eba22..8bfa9cfd 100644 --- a/.github/workflows/publish-openapi.yaml +++ b/.github/workflows/publish-openapi.yaml @@ -11,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: 17 + java_version: '21' diff --git a/build.gradle b/build.gradle index 72615313..9a80cf7e 100644 --- a/build.gradle +++ b/build.gradle @@ -132,13 +132,6 @@ repositories { } } -ext { - log4JVersion = "2.25.0" - logbackVersion = "1.5.18" -} - -ext['snakeyaml.version'] = '2.0' - dependencies { implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-actuator' @@ -148,11 +141,6 @@ dependencies { implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: '6.1.9' - implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4JVersion - implementation group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: log4JVersion - implementation group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion - implementation group: 'ch.qos.logback', name: 'logback-core', version: logbackVersion - testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test' testImplementation group: 'io.rest-assured', name: 'rest-assured', version: '5.5.5' }