From 8c53a767544ad910b97e132d2d7f8ed481142a32 Mon Sep 17 00:00:00 2001
From: Haebin <joker7011@naver.com>
Date: Mon, 18 Mar 2024 20:21:14 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into feat/#1

---
 CONFIG           |  2 +-
 build.gradle.kts | 95 +++++++++++++++++++++++++-----------------------
 2 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/CONFIG b/CONFIG
index 0a6d432..ee2d674 160000
--- a/CONFIG
+++ b/CONFIG
@@ -1 +1 @@
-Subproject commit 0a6d432e65784aba23824d934ae4da9f01e1bc6c
+Subproject commit ee2d674052b453ee4cb9ba339f513ae222f72cdf
diff --git a/build.gradle.kts b/build.gradle.kts
index 94a4a9f..b25dc48 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,77 +5,82 @@ val imageTag = System.getenv("IMAGE_TAG") ?: "latest"
 val repoURL: String? = System.getenv("IMAGE_REPO_URL")
 
 plugins {
-	id("org.springframework.boot") version "3.2.3"
-	id("io.spring.dependency-management") version "1.1.4"
-	id("com.google.cloud.tools.jib") version "3.4.1"
-	kotlin("jvm") version "1.9.22"
-	kotlin("plugin.spring") version "1.9.22"
-	kotlin("plugin.jpa") version "1.9.22"
-	kotlin("plugin.allopen") version "1.9.22"
+    id("org.springframework.boot") version "3.2.3"
+    id("io.spring.dependency-management") version "1.1.4"
+    id("com.google.cloud.tools.jib") version "3.4.1"
+    kotlin("jvm") version "1.9.22"
+    kotlin("plugin.spring") version "1.9.22"
+    kotlin("plugin.jpa") version "1.9.22"
+    kotlin("plugin.allopen") version "1.9.22"
 }
 
 group = "com.vacgom"
 version = "0.0.1-SNAPSHOT"
 
 java {
-	sourceCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_17
 }
 
 repositories {
-	mavenCentral()
+    mavenCentral()
 }
 
 dependencies {
-	implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-	implementation("org.springframework.boot:spring-boot-starter-security")
-	implementation("org.springframework.boot:spring-boot-starter-web")
-	implementation("org.springframework.boot:spring-boot-starter-validation")
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+    implementation("org.springframework.boot:spring-boot-starter-security")
+    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-validation")
 
-	implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
-	implementation("org.flywaydb:flyway-core")
-	implementation("org.flywaydb:flyway-mysql")
-	implementation("org.jetbrains.kotlin:kotlin-reflect")
-	developmentOnly("org.springframework.boot:spring-boot-devtools")
-	runtimeOnly("com.mysql:mysql-connector-j")
-	testImplementation("org.springframework.boot:spring-boot-starter-test")
-	testImplementation("org.springframework.security:spring-security-test")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+    implementation("org.flywaydb:flyway-core")
+    implementation("org.flywaydb:flyway-mysql")
+    implementation("org.jetbrains.kotlin:kotlin-reflect")
+    developmentOnly("org.springframework.boot:spring-boot-devtools")
+    runtimeOnly("com.mysql:mysql-connector-j")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.springframework.security:spring-security-test")
+
+    implementation("io.jsonwebtoken:jjwt-api:0.11.5")
+    implementation("io.jsonwebtoken:jjwt-gson:0.11.5")
+    runtimeOnly("io.jsonwebtoken:jjwt-impl:0.11.5")
+    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 }
 
 tasks.withType<KotlinCompile> {
-	kotlinOptions {
-		freeCompilerArgs += "-Xjsr305=strict"
-		jvmTarget = "17"
-	}
+    kotlinOptions {
+        freeCompilerArgs += "-Xjsr305=strict"
+        jvmTarget = "17"
+    }
 }
 
 tasks.withType<Test> {
-	useJUnitPlatform()
+    useJUnitPlatform()
 }
 
 tasks.processResources {
-	dependsOn("initConfig")
+    dependsOn("initConfig")
 }
 
 tasks.register<Copy>("initConfig") {
-	from("./CONFIG")
-	include("*.yml")
-	into("./src/main/resources")
+    from("./CONFIG")
+    include("*.yml")
+    into("./src/main/resources")
 }
 
 jib {
-	from {
-		image = "amazoncorretto:17-alpine3.18"
-	}
-	to {
-		image = repoURL
-		tags = setOf(imageTag)
-	}
-	container {
-		jvmFlags = listOf(
-			"-Dspring.profiles.active=${activeProfile}",
-			"-Dserver.port=8080",
-			"-XX:+UseContainerSupport",
-		)
-		ports = listOf("8080")
-	}
+    from {
+        image = "amazoncorretto:17-alpine3.18"
+    }
+    to {
+        image = repoURL
+        tags = setOf(imageTag)
+    }
+    container {
+        jvmFlags = listOf(
+                "-Dspring.profiles.active=${activeProfile}",
+                "-Dserver.port=8080",
+                "-XX:+UseContainerSupport",
+        )
+        ports = listOf("8080")
+    }
 }