chore: CI/CD JDK 버전, swagger 라이브러리 변경

chore: CI/CD JDK 버전, swagger 라이브러리 변경

.github/workflows/gradle.yml

@@ -16,10 +16,10 @@ jobs:
     steps:
       ## jdk setting
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin' # https://github.com/actions/setup-java
 
       ## gradle caching

build.gradle

@@ -1,14 +1,14 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '2.7.13'
-	id 'io.spring.dependency-management' version '1.0.15.RELEASE'
+	id 'org.springframework.boot' version '3.3.4'
+	id 'io.spring.dependency-management' version '1.1.6'
 }
 
 group = 'com.web'
 version = '0.0.1-SNAPSHOT'
 
 java {
-	sourceCompatibility = '11'
+	sourceCompatibility = '17'
 }
 
 configurations {
@@ -33,7 +33,8 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
 	// Swagger
-	implementation 'io.springfox:springfox-boot-starter:3.0.0'
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.1.0'
 
 	// Redis
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'

src/main/generated/com/web/stard/domain/notification/dto/SseMapStructImpl.java

@@ -0,0 +1,25 @@
+package com.web.stard.domain.notification.dto;
+
+import com.web.stard.domain.notification.domain.Notification;
+import javax.annotation.processing.Generated;
+
+@Generated(
+    value = "org.mapstruct.ap.MappingProcessor",
+    date = "2024-10-04T15:46:49+0900",
+    comments = "version: 1.5.3.Final, compiler: javac, environment: Java 17.0.9 (Oracle Corporation)"
+)
+public class SseMapStructImpl implements SseMapStruct {
+
+    @Override
+    public ResponseNotificationDto toResponseNotification(Notification notification) {
+        if ( notification == null ) {
+            return null;
+        }
+
+        ResponseNotificationDto.ResponseNotificationDtoBuilder responseNotificationDto = ResponseNotificationDto.builder();
+
+        responseNotificationDto.notification( notification );
+
+        return responseNotificationDto.build();
+    }
+}

src/main/java/com/web/stard/domain/admin/api/FaqController.java

@@ -11,7 +11,7 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 @Transactional
 @Getter

src/main/java/com/web/stard/domain/admin/api/NoticeController.java

@@ -11,7 +11,7 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 import java.util.Optional;
 
 @Transactional

src/main/java/com/web/stard/domain/board/community/api/QnaController.java

@@ -11,7 +11,7 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 @Transactional
 @Getter @Setter

src/main/java/com/web/stard/domain/board/global/application/ReplyService.java

@@ -28,7 +28,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.EntityNotFoundException;
 import java.util.List;
 import java.util.Optional;
 

src/main/java/com/web/stard/domain/board/global/application/ReportService.java

@@ -29,7 +29,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.EntityNotFoundException;
 import java.util.*;
 
 @Transactional

src/main/java/com/web/stard/domain/board/global/domain/Post.java

@@ -1,12 +1,12 @@
 package com.web.stard.domain.board.global.domain;
 
-import com.sun.istack.NotNull;
 import com.web.stard.domain.board.global.domain.enums.PostType;
 import com.web.stard.domain.member.domain.Member;
 import com.web.stard.global.domain.BaseEntity;
+import jakarta.validation.constraints.NotNull;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table

src/main/java/com/web/stard/domain/board/global/domain/Reply.java

@@ -7,8 +7,8 @@
 import com.web.stard.global.domain.BaseEntity;
 import lombok.*;
 
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 
 @Entity
 @Table

src/main/java/com/web/stard/domain/board/global/domain/Report.java

@@ -6,8 +6,8 @@
 import com.web.stard.domain.member.domain.Member;
 import lombok.*;
 
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 
 @Entity
 @Table

src/main/java/com/web/stard/domain/board/global/domain/ReportDetail.java

@@ -5,7 +5,7 @@
 import com.web.stard.global.domain.BaseEntity;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table

src/main/java/com/web/stard/domain/board/global/domain/StarScrap.java

@@ -1,14 +1,14 @@
 package com.web.stard.domain.board.global.domain;
 
-import com.sun.istack.NotNull;
+import jakarta.validation.constraints.NotNull;
 import com.web.stard.domain.board.global.domain.enums.ActType;
 import com.web.stard.domain.board.global.domain.enums.PostType;
 import com.web.stard.domain.board.study.domain.Study;
 import com.web.stard.domain.board.study.domain.StudyPost;
 import com.web.stard.domain.member.domain.Member;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table

src/main/java/com/web/stard/domain/board/study/domain/Applicant.java

@@ -1,13 +1,12 @@
 package com.web.stard.domain.board.study.domain;
 
-import com.web.stard.domain.board.study.domain.Study;
 import com.web.stard.domain.member.domain.Member;
 import lombok.*;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 @Entity

src/main/java/com/web/stard/domain/board/study/domain/Assignee.java

@@ -3,7 +3,7 @@
 import com.web.stard.domain.member.domain.Member;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table

src/main/java/com/web/stard/domain/board/study/domain/Evaluation.java

@@ -1,11 +1,10 @@
 package com.web.stard.domain.board.study.domain;
 
-import com.sun.istack.NotNull;
+import jakarta.validation.constraints.NotNull;
 import com.web.stard.domain.member.domain.Member;
-import com.web.stard.domain.board.study.domain.Study;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table

src/main/java/com/web/stard/domain/board/study/domain/Schedule.java

@@ -1,11 +1,10 @@
 package com.web.stard.domain.board.study.domain;
 
-import com.sun.istack.NotNull;
-import com.web.stard.domain.board.study.domain.Study;
+import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @Entity

src/main/java/com/web/stard/domain/board/study/domain/Study.java

@@ -1,6 +1,6 @@
 package com.web.stard.domain.board.study.domain;
 
-import com.sun.istack.NotNull;
+import jakarta.validation.constraints.NotNull;
 import com.web.stard.domain.board.global.domain.enums.PostType;
 import com.web.stard.domain.board.study.domain.enums.ProgressStatus;
 import com.web.stard.domain.board.study.domain.enums.RecruitStatus;
@@ -10,7 +10,7 @@
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDate;
 
 @Entity

src/main/java/com/web/stard/domain/board/study/domain/StudyMember.java

@@ -3,8 +3,8 @@
 import com.web.stard.domain.member.domain.Member;
 import lombok.*;
 
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 
 @Entity
 @Builder

src/main/java/com/web/stard/domain/board/study/domain/StudyPost.java

@@ -1,12 +1,12 @@
 package com.web.stard.domain.board.study.domain;
 
-import com.sun.istack.NotNull;
+import jakarta.validation.constraints.NotNull;
 import com.web.stard.domain.board.global.domain.enums.PostType;
 import com.web.stard.domain.member.domain.Member;
 import com.web.stard.global.domain.BaseEntity;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table

src/main/java/com/web/stard/domain/board/study/domain/ToDo.java

@@ -1,10 +1,10 @@
 package com.web.stard.domain.board.study.domain;
 
-import com.sun.istack.NotNull;
+import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @Entity

src/main/java/com/web/stard/domain/board/study/dto/StudyDto.java

@@ -1,6 +1,6 @@
 package com.web.stard.domain.board.study.dto;
 
-import com.sun.istack.NotNull;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/web/stard/domain/chat_stomp/application/ChatRoomService.java

@@ -2,11 +2,11 @@
 
 import com.web.stard.domain.chat_stomp.domain.ChatRoom;
 import com.web.stard.domain.chat_stomp.repository.ChatRoomRepository;
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
 import java.util.*;
 
 @Service

src/main/java/com/web/stard/domain/chat_stomp/domain/ChatMessage.java

@@ -7,8 +7,8 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 
 @Getter
 @Setter

src/main/java/com/web/stard/domain/chat_stomp/domain/ChatRoom.java

@@ -2,9 +2,8 @@
 
 import lombok.*;
 
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
-import java.util.UUID;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 
 @Getter
 @Setter

src/main/java/com/web/stard/domain/member/api/PasswordController.java

@@ -2,16 +2,13 @@
 
 import com.web.stard.domain.member.dto.EmailDto;
 import com.web.stard.domain.member.application.EmailService;
-import com.web.stard.domain.member.dto.PasswordUpdateDto;
 import com.web.stard.domain.member.dto.ResetPasswordResponse;
 import com.web.stard.domain.member.application.MemberService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
 
-import javax.mail.MessagingException;
+import jakarta.mail.MessagingException;
 
 @RestController
 @RequiredArgsConstructor

src/main/java/com/web/stard/domain/member/api/SignController.java

@@ -3,16 +3,16 @@
 import com.web.stard.domain.member.dto.MemberRequestDto;
 import com.web.stard.domain.member.application.SignService;
 import com.web.stard.global.dto.TokenInfo;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -22,19 +22,19 @@ public class SignController {
 
     private final SignService signService;
 
-    @ApiOperation(value = "로그인")
+    @Operation(description = "로그인")
     @PostMapping("/sign-in")
     public ResponseEntity<TokenInfo> signIn(@Valid @RequestBody MemberRequestDto.SignInDto dto) {
         return ResponseEntity.ok().body(signService.signIn(dto));
     }
 
-    @ApiOperation(value = "토큰 재발급")
+    @Operation(description = "토큰 재발급")
     @PostMapping("/reissue")
     public ResponseEntity<TokenInfo> reissue(HttpServletRequest request) {
         return ResponseEntity.ok().body(signService.reissue(request));
     }
 
-    @ApiOperation(value = "로그아웃")
+    @Operation(description = "로그아웃")
     @PostMapping("/sign-out")
     public void signOut(HttpServletRequest request) {
         signService.signOut(request);

src/main/java/com/web/stard/domain/member/application/EmailService.java

@@ -2,7 +2,7 @@
 
 import com.web.stard.domain.member.dto.EmailDto;
 
-import javax.mail.MessagingException;
+import jakarta.mail.MessagingException;
 
 public interface EmailService {