diff --git a/.gradle/8.10/checksums/checksums.lock b/.gradle/8.10/checksums/checksums.lock index e94214a..bebc2c1 100644 Binary files a/.gradle/8.10/checksums/checksums.lock and b/.gradle/8.10/checksums/checksums.lock differ diff --git a/.gradle/8.10/checksums/md5-checksums.bin b/.gradle/8.10/checksums/md5-checksums.bin index fd08dbc..41fc487 100644 Binary files a/.gradle/8.10/checksums/md5-checksums.bin and b/.gradle/8.10/checksums/md5-checksums.bin differ diff --git a/.gradle/8.10/checksums/sha1-checksums.bin b/.gradle/8.10/checksums/sha1-checksums.bin index 1470adf..2c12e4f 100644 Binary files a/.gradle/8.10/checksums/sha1-checksums.bin and b/.gradle/8.10/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.4/checksums/checksums.lock b/.gradle/8.4/checksums/checksums.lock deleted file mode 100644 index 5cff088..0000000 Binary files a/.gradle/8.4/checksums/checksums.lock and /dev/null differ diff --git a/.gradle/8.4/checksums/md5-checksums.bin b/.gradle/8.4/checksums/md5-checksums.bin deleted file mode 100644 index 28773cd..0000000 Binary files a/.gradle/8.4/checksums/md5-checksums.bin and /dev/null differ diff --git a/.gradle/8.4/checksums/sha1-checksums.bin b/.gradle/8.4/checksums/sha1-checksums.bin deleted file mode 100644 index ef10225..0000000 Binary files a/.gradle/8.4/checksums/sha1-checksums.bin and /dev/null differ diff --git a/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock b/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock deleted file mode 100644 index c15a074..0000000 Binary files a/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock and /dev/null differ diff --git a/.gradle/8.4/dependencies-accessors/gc.properties b/.gradle/8.4/dependencies-accessors/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.gradle/8.4/executionHistory/executionHistory.bin b/.gradle/8.4/executionHistory/executionHistory.bin deleted file mode 100644 index 4edce9e..0000000 Binary files a/.gradle/8.4/executionHistory/executionHistory.bin and /dev/null differ diff --git a/.gradle/8.4/executionHistory/executionHistory.lock b/.gradle/8.4/executionHistory/executionHistory.lock deleted file mode 100644 index 86a1b97..0000000 Binary files a/.gradle/8.4/executionHistory/executionHistory.lock and /dev/null differ diff --git a/.gradle/8.4/fileChanges/last-build.bin b/.gradle/8.4/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/.gradle/8.4/fileChanges/last-build.bin and /dev/null differ diff --git a/.gradle/8.4/fileHashes/fileHashes.bin b/.gradle/8.4/fileHashes/fileHashes.bin deleted file mode 100644 index 0eb0f6b..0000000 Binary files a/.gradle/8.4/fileHashes/fileHashes.bin and /dev/null differ diff --git a/.gradle/8.4/fileHashes/fileHashes.lock b/.gradle/8.4/fileHashes/fileHashes.lock deleted file mode 100644 index 165db89..0000000 Binary files a/.gradle/8.4/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/8.4/fileHashes/resourceHashesCache.bin b/.gradle/8.4/fileHashes/resourceHashesCache.bin deleted file mode 100644 index 7e8d3e5..0000000 Binary files a/.gradle/8.4/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/.gradle/8.4/gc.properties b/.gradle/8.4/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.idea/modules/member/lifesub.member.test.iml b/.idea/modules/member/lifesub.member.test.iml deleted file mode 100644 index 4a0a830..0000000 --- a/.idea/modules/member/lifesub.member.test.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 0379857..46c8b65 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,8 @@ plugins { id 'org.springframework.boot' version '3.4.0' apply false //id 'io.spring.dependency-management' version '1.1.6' apply false id 'java' + + id "org.sonarqube" version "5.0.0.4638" apply false //apply false 해야 서브 프로젝트에 제대로 적용됨 } allprojects { @@ -14,7 +16,14 @@ subprojects { apply plugin: 'java' apply plugin: 'org.springframework.boot' apply plugin: 'io.spring.dependency-management' - + + apply plugin: 'org.sonarqube' + apply plugin: 'jacoco' // 서브 프로젝트에 JaCoCo 플러그인 적용 + + jacoco { + toolVersion = "0.8.11" // JaCoCo 최신 버전 사용 + } + repositories { mavenCentral() } @@ -59,6 +68,29 @@ subprojects { testLogging { events "passed", "skipped", "failed" } + finalizedBy jacocoTestReport // 테스트 후 JaCoCo 리포트 생성 + } + + jacocoTestReport { + dependsOn test + reports { + xml.required = true // SonarQube 분석을 위해 XML 형식 필요 + csv.required = false + html.required = true + html.outputLocation = layout.buildDirectory.dir("jacocoHtml").get().asFile + } + + afterEvaluate { + classDirectories.setFrom(files(classDirectories.files.collect { + fileTree(dir: it, exclude: [ + "**/config/**", // 설정 클래스 제외 + "**/entity/**", // 엔티티 클래스 제외 + "**/dto/**", // DTO 클래스 제외 + "**/*Application.class", // 메인 애플리케이션 클래스 제외 + "**/exception/**" // 예외 클래스 제외 + ]) + })) + } } } diff --git a/deployment/Jenkinsfile b/deployment/Jenkinsfile index a05e978..d3329df 100644 --- a/deployment/Jenkinsfile +++ b/deployment/Jenkinsfile @@ -39,7 +39,7 @@ podTemplate( stage("Get Source") { checkout scm props = readProperties file: "deployment/deploy_env_vars" - namespace = "${props.teamid}-${props.root_project}-ns" + namespace = "${props.namespace}" } stage("Setup AKS") { diff --git a/deployment/deploy_env_vars b/deployment/deploy_env_vars index 01442cd..d2c737c 100644 --- a/deployment/deploy_env_vars +++ b/deployment/deploy_env_vars @@ -1,9 +1,10 @@ # Team Settings -teamid=dg0200 +teamid=unicorn root_project=lifesub +namespace=unicorn-lifesub-ns # Container Registry Settings -registry=dg0200cr.azurecr.io +registry=unicorncr.azurecr.io image_org=lifesub # Application Settings