From 3505f5ab4d50e0fc3d79de78556cd16b5273b021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=A7=80=EB=A5=9C?= Date: Tue, 8 Oct 2024 20:52:14 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20@transaction=20import=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/web/stard/domain/admin/api/FaqController.java | 2 +- .../java/com/web/stard/domain/admin/api/NoticeController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/web/stard/domain/admin/api/FaqController.java b/src/main/java/com/web/stard/domain/admin/api/FaqController.java index cd308ca..3df6402 100644 --- a/src/main/java/com/web/stard/domain/admin/api/FaqController.java +++ b/src/main/java/com/web/stard/domain/admin/api/FaqController.java @@ -9,9 +9,9 @@ import org.springframework.data.domain.Page; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import jakarta.transaction.Transactional; @Transactional @Getter diff --git a/src/main/java/com/web/stard/domain/admin/api/NoticeController.java b/src/main/java/com/web/stard/domain/admin/api/NoticeController.java index b890891..266f2ce 100644 --- a/src/main/java/com/web/stard/domain/admin/api/NoticeController.java +++ b/src/main/java/com/web/stard/domain/admin/api/NoticeController.java @@ -9,9 +9,9 @@ import org.springframework.data.domain.Page; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import jakarta.transaction.Transactional; import java.util.Optional; @Transactional From a444f7d6988d05c662abb3f6bc0c27f5e47afbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=8A=B9=EC=97=B0?= Date: Thu, 10 Oct 2024 13:58:22 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20dockerfile=20jdk=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0423d32..070774f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11-jdk +FROM openjdk:17-jdk ARG JAR_FILE=./build/libs/*-SNAPSHOT.jar COPY ${JAR_FILE} app.jar ENTRYPOINT [ "java", "-jar", "/app.jar" ] \ No newline at end of file