Skip to content

Commit 0d3650b

Browse files
asp345asp345
authored
jdk 21 / 의존성 업그레이드 (#380)
1 parent 405ccb6 commit 0d3650b

123 files changed

Lines changed: 1467 additions & 1102 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ jobs:
1212

1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v4
1616

1717
- name: Configure AWS credentials
18-
uses: aws-actions/configure-aws-credentials@v2
18+
uses: aws-actions/configure-aws-credentials@v4
1919
with:
2020
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
2121
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2222
aws-region: ap-northeast-2
2323

24-
- name: Set up JDK 17
25-
uses: actions/setup-java@v3
24+
- name: Set up JDK 21
25+
uses: actions/setup-java@v4
2626
with:
27-
java-version: '17'
27+
java-version: '21'
2828
distribution: 'temurin'
2929

3030
- name: Run Tests

‎.github/workflows/deploy-dev.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ jobs:
1717

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
2121

2222
- name: Configure AWS credentials
23-
uses: aws-actions/configure-aws-credentials@v2
23+
uses: aws-actions/configure-aws-credentials@v4
2424
with:
2525
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
2626
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2727
aws-region: ap-northeast-2
2828

2929
- name: Login to ECR
3030
id: login-ecr
31-
uses: aws-actions/amazon-ecr-login@v1
31+
uses: aws-actions/amazon-ecr-login@v2
3232

3333
- name: Get and save Auth Token for CodeArtifact
3434
id: get-save-codeartifact-auth-token

‎.github/workflows/deploy-prod.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ jobs:
1717

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
2121

2222
- name: Configure AWS credentials
23-
uses: aws-actions/configure-aws-credentials@v2
23+
uses: aws-actions/configure-aws-credentials@v4
2424
with:
2525
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
2626
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2727
aws-region: ap-northeast-2
2828

2929
- name: Login to ECR
3030
id: login-ecr
31-
uses: aws-actions/amazon-ecr-login@v1
31+
uses: aws-actions/amazon-ecr-login@v2
3232

3333
- name: Get and save Auth Token for CodeArtifact
3434
id: get-save-codeartifact-auth-token
@@ -45,7 +45,7 @@ jobs:
4545
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
4646
4747
- name: Slack Notify
48-
uses: rtCamp/action-slack-notify@v2.1.2
48+
uses: rtCamp/action-slack-notify@v2.3.3
4949
env:
5050
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
5151
SLACK_CHANNEL: team-snutt-deploy

‎.github/workflows/lint.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212

1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v4
1616

17-
- name: Set up JDK 17
18-
uses: actions/setup-java@v3
17+
- name: Set up JDK 21
18+
uses: actions/setup-java@v4
1919
with:
20-
java-version: '17'
20+
java-version: '21'
2121
distribution: 'temurin'
2222

2323
- name: Run Lint

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openjdk:17-jdk-slim
1+
FROM eclipse-temurin:21-alpine
22
WORKDIR /app
33
ARG CODEARTIFACT_AUTH_TOKEN
44
COPY . /app

‎Dockerfile-batch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openjdk:17-jdk-slim
1+
FROM eclipse-temurin:21-alpine
22
WORKDIR /app
33
ARG CODEARTIFACT_AUTH_TOKEN
44
COPY . /app

‎api/build.gradle.kts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
plugins {
22
id("org.springframework.boot")
3-
id("org.unbroken-dome.test-sets") version "4.0.0"
3+
id("org.unbroken-dome.test-sets") version "4.1.0"
44
}
55

66
dependencies {
77
implementation(project(":core"))
88

99
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
1010

11-
implementation("io.jsonwebtoken:jjwt:0.9.1")
12-
runtimeOnly("javax.xml.bind:jaxb-api:2.1")
11+
implementation("io.jsonwebtoken:jjwt-api:0.12.6")
12+
implementation("io.jsonwebtoken:jjwt-impl:0.12.6")
13+
implementation("io.jsonwebtoken:jjwt-jackson:0.12.6")
14+
runtimeOnly("jakarta.xml.bind:jakarta.xml.bind-api:4.0.2")
1315

1416
testImplementation(testFixtures(project(":core")))
1517
testImplementation("org.springframework.boot:spring-boot-testcontainers")
16-
testImplementation("org.testcontainers:mongodb:1.19.0")
17-
testImplementation("io.kotest.extensions:kotest-extensions-spring:1.1.2")
18+
testImplementation("org.testcontainers:mongodb:1.21.3")
19+
testImplementation("io.kotest.extensions:kotest-extensions-spring:1.3.0")
1820
}
1921

2022
tasks.bootJar {

‎api/src/main/kotlin/filter/ErrorWebFilter.kt‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ class ErrorWebFilter(
2626
override fun filter(
2727
exchange: ServerWebExchange,
2828
chain: WebFilterChain,
29-
): Mono<Void> {
30-
return chain.filter(exchange)
29+
): Mono<Void> =
30+
chain
31+
.filter(exchange)
3132
.onErrorResume { throwable ->
3233
val errorBody: ErrorBody
3334
val httpStatusCode: HttpStatusCode
@@ -79,11 +80,9 @@ class ErrorWebFilter(
7980
Mono.empty()
8081
}
8182
}
82-
}
8383

84-
private fun makeErrorBody(exception: SnuttException): ErrorBody {
85-
return ErrorBody(exception.error.errorCode, exception.errorMessage, exception.displayMessage, exception.ext)
86-
}
84+
private fun makeErrorBody(exception: SnuttException): ErrorBody =
85+
ErrorBody(exception.error.errorCode, exception.errorMessage, exception.displayMessage, exception.ext)
8786
}
8887

8988
private data class ErrorBody(

‎api/src/main/kotlin/handler/BuildingHandler.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ class BuildingHandler(
1818
suspend fun searchBuildings(req: ServerRequest): ServerResponse =
1919
handle(req) {
2020
val placesQuery =
21-
req.parseRequiredQueryParam<String>("places")
21+
req
22+
.parseRequiredQueryParam<String>("places")
2223
.split(",")
2324
.flatMap { PlaceInfo.getValuesOf(it) }
2425
.distinct()

‎api/src/main/kotlin/handler/FriendHandler.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ class FriendHandler(
9797
val userId = req.userId
9898
val requestToken = req.pathVariable("requestToken")
9999

100-
friendService.acceptFriendByLink(userId, requestToken)
101-
.let {
102-
(friend, partner) ->
100+
friendService
101+
.acceptFriendByLink(userId, requestToken)
102+
.let { (friend, partner) ->
103103
FriendResponse(
104104
id = friend.id!!,
105105
userId = partner.id!!,

0 commit comments

Comments
 (0)