Skip to content

Commit

Permalink
build/#131 최상위 build.gradle version 분리
Browse files Browse the repository at this point in the history
  • Loading branch information
JiwonDev committed Jan 5, 2024
1 parent 4716a8b commit 79fe22c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ public RawToken parse(String token) {
.build()
.parseSignedClaims(token);

String jti = (String) jwt.getBody().get("jti");
String jti = (String) jwt.getPayload().get("jti");
if (jti == null) {
return new RawToken((String) jwt.getPayload().get("email"),
(List<String>) jwt.getPayload().get("scopes"));
}
return new RawToken((String) jwt.getBody().get("email"), jti,
return new RawToken((String) jwt.getPayload().get("email"), jti,
(List<String>) jwt.getPayload().get("scopes"));
} catch (UnsupportedJwtException | MalformedJwtException | IllegalArgumentException ex) {
log.error("Invalid JWT Token", ex);
Expand Down
15 changes: 8 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ subprojects {
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation("au.com.console:kassava:2.0.0")
implementation("net.logstash.logback:logstash-logback-encoder:7.2")
implementation("au.com.console:kassava:${Version.kassava}")
implementation("net.logstash.logback:logstash-logback-encoder:${Version.logstashLogbackEncoder}")

testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("io.kotest:kotest-runner-junit5:5.5.4")
testImplementation("io.kotest:kotest-assertions-core:5.5.4")
testImplementation("io.kotest.extensions:kotest-extensions-spring:1.1.2")
testImplementation("io.mockk:mockk:1.12.0")
testImplementation("io.kotest:kotest-runner-junit5:${Version.kotest}")
testImplementation("io.kotest:kotest-assertions-core:${Version.kotest}")
testImplementation("io.kotest.extensions:kotest-extensions-spring:${Version.kotestSpring}")
testImplementation("io.mockk:mockk:${Version.mockk}")
}

tasks.withType<KotlinCompile> {
Expand All @@ -99,7 +99,7 @@ subprojects {
}

tasks.withType<ProcessResources> {
// 동일한 파일(main/resources/application.yaml, intTest/resources/application.yaml)이 있어서, 리소스 복사할 때 충돌 회피
// 동일한 파일(main/resources/application.yml, intTest/resources/application.yml)이 있어서, 리소스 복사할 때 충돌 회피
duplicatesStrategy = DuplicatesStrategy.INCLUDE
}

Expand All @@ -119,6 +119,7 @@ subprojects {
}

reports {
// app/build/reports/jacoco/test/html/index.html
html.required.set(true)
junitXml.required.set(true)
}
Expand Down
5 changes: 5 additions & 0 deletions buildSrc/src/main/kotlin/Version.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,9 @@ object Version {
const val embeddedRedis = "0.7.3"
const val fixtureMonkey = "0.3.5"
const val mybatisSpring = "3.0.2"
const val kassava = "2.0.0"
const val logstashLogbackEncoder = "7.2"
const val kotest = "5.5.4"
const val kotestSpring = "1.1.2"
const val mockk = "1.12.0"
}

0 comments on commit 79fe22c

Please sign in to comment.