diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 22ae9d27..3be06013 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -13,11 +13,11 @@ jobs: - name: Checkout sources uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v4 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' - name: Setup Gradle uses: gradle/gradle-build-action@v3 diff --git a/.github/workflows/depoly-production.yml b/.github/workflows/depoly-production.yml index d5adad9d..b95bf981 100644 --- a/.github/workflows/depoly-production.yml +++ b/.github/workflows/depoly-production.yml @@ -13,11 +13,11 @@ jobs: - name: Checkout sources uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v4 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' - name: Setup Gradle uses: gradle/gradle-build-action@v3 diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 1ad03c64..3424af1c 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -16,11 +16,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v4 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' - name: Cache Gradle packages uses: actions/cache@v3 diff --git a/.github/workflows/spotless-check.yml b/.github/workflows/spotless-check.yml index 255896fd..6e3cc26d 100644 --- a/.github/workflows/spotless-check.yml +++ b/.github/workflows/spotless-check.yml @@ -8,11 +8,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v4 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' - name: Grant execute permission for gradlew run: chmod +x ./gradlew diff --git a/Dockerfile b/Dockerfile index f38b07f4..5cdef244 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11-jre-slim as spring +FROM openjdk:17-jre-slim as spring ARG JAR_FILE=./resource-server/build/libs/resource-server-0.0.1-SNAPSHOT.jar diff --git a/build.gradle b/build.gradle index 9fb07a3d..194f89c6 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,12 @@ subprojects { group = 'com.inhabas' version = '0.0.1-SNAPSHOT' - sourceCompatibility = '11' + + java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } + } repositories { mavenCentral() @@ -137,7 +142,6 @@ project(':module-auth') { // security api 'org.springframework.boot:spring-boot-starter-security' api 'org.springframework.boot:spring-boot-starter-oauth2-client' - api 'org.springframework.security:spring-security-core:5.1.6.RELEASE' api 'javax.xml.bind:jaxb-api' testImplementation 'org.springframework.security:spring-security-test' testImplementation 'org.mockito:mockito-inline:2.13.0'