문제: 앞 커밋이 Gradle 루트를 저장소 루트로 옮기고 계층 폴더를 묶었다.
빌드 스크립트·build-logic·시험·workflow·스크립트·문서가 아직 옛 배치
(Gradle 루트 = src/)를 가정해 빌드가 되지 않는다.
고른 방법:
- Gradle 경로와 registry id는 그대로 둔다(:app-bootstrap, :application-core,
:composition:*). registry의 source_path만 새 폴더를 가리킨다. 폴더에 맞춘
이름(:domain:core, :application:core)은 프로젝트 이름 core가 둘이 되어
boot jar의 BOOT-INF/lib와 기본 capability가 겹치고, 파생 서비스의 모든
project(':…') 줄을 바꾸게 한다.
- registry는 gradle/modules.json, 시험 이미지 목록은
gradle/container-images.properties: 버전 카탈로그 옆, 빌드가 고정하는 것.
config/는 코드 검사 도구 설정만 둔다.
- build-logic: settings·architecture 플러그인의 저장소 루트를 Gradle 루트로
(getParentFile 제거). config contract의 파일 트리는 src/만 훑는다(루트를
훑으면 docs·.claude/worktrees까지 줍는다).
- 빌드 스크립트: rootProject.projectDir.parentFile → rootProject.projectDir,
rootProject.file('../…') → rootProject.file('…'), 옛 src 기준 include에
src/를 붙인다. notification API surface의 application-notification 소스
루트를 새 폴더로(놓치면 272개 타입이 surface에서 말없이 빠진다).
- 시험: 옛 src 기준 모듈 목록과 ../ 개수를 고친다. 없는 폴더를 말없이
건너뛰던 목록(MessagingAuthority, NotificationPayloadAtRest 등)을 새
폴더로, FileserverDocumentationCoverageTest는 Gradle 경로 → 폴더를
registry로 찾는다. Docker 계약은 WORKDIR /build, 새 jar 경로.
- Docker: 빌드 context를 저장소 루트로, .dockerignore는 허용 목록으로 다시
써서 전에 context였던 것만 들어가게 한다. compose의 build.context는 .,
env_file은 ./.env.
- workflow: working-directory: src 기본값과 그것을 되돌리던 줄을 지운다.
- scripts: verify.sh, ci/*, bootstrap-local, new-feature,
verify-feature-scaffold, mongo 검증, hooks, check-repo-layout 허용 목록.
check-docs의 경로 검사는 build-logic/·gradle/로 시작하는 경로도 본다.
- 문서: AGENTS.md 지도, README 구조 표, leaf AGENTS.md의 cd src, gates·
operate·결정 색인, src/bootstrap/AGENTS.md를 조립 계층 family 규칙으로
다시 쓴다. 기록 문서(docs/design·history·reviews, 지난 upgrade 안내,
capability-status 제거 표)는 머리 블록만 고친다. 파생 서비스용 안내
docs/upgrade/2026-11-relayout.md를 더한다.
위험: bootRun working dir가 저장소 루트가 되어 .env와 상대 경로 설정이
루트 기준이다. 루트 .env는 compose 보간에도 읽힌다(upgrade 안내 5절).
파생 서비스는 태그 pre-relayout-2026-11까지 받은 뒤 이 묶음을 받는다.
검증: desktop에서 캐시 없이 scripts/verify.sh docs·pr·main·release,
compose smoke 18 lane, 빠른 시작(scripts/verify.sh app). 결과는 PR 본문.
구조 리뷰(arch-reviewer) 지적 5건을 반영했다.
BREAKING CHANGE: Gradle은 저장소 루트에서 돈다(cd src 없음). registry는
gradle/modules.json, 이미지 빌드 context는 저장소 루트다. 옛 경로 → 새 경로
표는 docs/upgrade/2026-11-relayout.md.
Refs: design-docs repo-structure/01-backend-layout.md 6.1절 가-2·가-3
181 lines
12 KiB
TOML
181 lines
12 KiB
TOML
# Version catalog — every dependency version this build pins itself.
|
|
#
|
|
# Versions managed by an imported BOM are NOT here: a BOM already owns them, and restating a managed
|
|
# version would create a second answer to the same question. The BOM's own coordinate is a different
|
|
# question and it is here — `awsSdk` and `grpc` below are the versions of the BOMs themselves, which
|
|
# this build does choose. What is here is the set a module used to spell out inline, once per usage.
|
|
#
|
|
# The reason is visibility, not reproducibility — `gradle.lockfile` already fixes what resolves.
|
|
# Before this file, 59 coordinate strings were scattered across 15 build files and nothing could
|
|
# show them side by side, so two artifacts had quietly reached two versions:
|
|
#
|
|
# * spock-core 2.3-groovy-4.0 and 2.4-groovy-5.0
|
|
# * protobuf-java 4.29.3 and 4.33.2 (the 4.33.2 user, the messaging library's protobuf codec,
|
|
# moved to its own repository on 2026-11-08)
|
|
#
|
|
# Both are kept as separate aliases rather than unified. Unifying them here would change what
|
|
# resolves, in a change whose whole purpose is that it does not; the aliases make the split
|
|
# reviewable, and whoever converges them does so deliberately with the lockfiles regenerated.
|
|
#
|
|
# Tool and plugin versions live here too. They are not dependencies of any module, so they never
|
|
# appear in a gradle.lockfile and nothing but this file can show them side by side. Four of them
|
|
# (Spring Boot, spotless, spotbugs, errorprone) were spelled out in the root `plugins {}` block, and
|
|
# three more (google-java-format, the Checkstyle tool, the SpotBugs tool) inside the shared
|
|
# `configure(subprojects)` block; the errorprone *plugin* and the errorprone *checker* it runs were
|
|
# pinned in two different files, which is exactly the pair this file exists to put next to each
|
|
# other.
|
|
#
|
|
# What is deliberately NOT here: the BOM property overrides in build-logic's JavaConventionsPlugin
|
|
# (ca.java-conventions) — `commons-lang3.version`, `httpcore5.version`, `httpclient5.version`. They
|
|
# are not versions this build chooses but overrides of ones the Spring Boot BOM already manages, each
|
|
# valid only next to the sentence that says what breaks without it (the SpotBugs worker's
|
|
# NoClassDefFoundError; httpcore5's unfixed advisories). Moving the numbers here would leave the
|
|
# reasons behind.
|
|
|
|
[versions]
|
|
approvaltests = "31.0.0"
|
|
assertj = "3.27.7"
|
|
archunit = "1.3.0"
|
|
# AWS SDK v2 BOM coordinate. Imported at MODULE scope by adapter:outbound:objectstorage
|
|
# and app-bootstrap through `ext.awsSdkVersion`, which reads this key.
|
|
awsSdk = "2.30.0"
|
|
# Checkstyle *tool* version (the `checkstyle` extension), not a plugin: Checkstyle is a Gradle
|
|
# built-in plugin with no coordinate of its own.
|
|
checkstyle = "13.5.0"
|
|
errorprone = "2.49.0"
|
|
# The Gradle plugin that runs the checker above. Two different artifacts, two different version
|
|
# lines, deliberately adjacent so a bump of one is visibly not a bump of the other.
|
|
errorpronePlugin = "5.1.0"
|
|
findsecbugs = "1.14.0"
|
|
# Spotless's google-java-format step. A formatter version is a repository-wide decision: a bump
|
|
# reformats every file.
|
|
googleJavaFormat = "1.35.0"
|
|
# Pinned (see `pinned-*` below). CVE-2026-102554, fixed in 33.7.2. Brought by gRPC (33.2.1), Error
|
|
# Prone (33.5.0) and the Checkstyle tool (33.6.0).
|
|
guava = "33.7.2-jre"
|
|
# io.grpc BOM. adapter:inbound:grpc reads it and imports the BOM at MODULE scope to keep the
|
|
# strict-locking blast radius off the shared platform. The gRPC platform library (grpc-library repo,
|
|
# Maven group dev.cakit.grpc) pins its own; no catalog entry here until a leaf adopts it.
|
|
grpc = "1.75.0"
|
|
jmh = "1.37"
|
|
jmhPlugin = "0.7.3"
|
|
jqwik = "1.9.1"
|
|
# Jackson 3 and the JSON-Schema validator once shared a number by coincidence, not by
|
|
# contract; separate keys so bumping one cannot move the other. Only build-logic resolves
|
|
# jackson3 as written: in the leaves the Spring Boot BOM's jackson-bom decides. Keep it at the
|
|
# BOM's number so the build and the application run the same Jackson.
|
|
jackson3 = "3.1.7"
|
|
jsonSchemaValidator = "3.0.2"
|
|
junitJupiter = "5.11.3"
|
|
junitPlatform = "1.11.3"
|
|
logstashLogbackEncoder = "8.0"
|
|
# Pinned (see `pinned-*` below). CVE-2026-106451, fixed in 1.11.4. Brought by kafka-clients (1.10.1).
|
|
lz4Java = "1.11.4"
|
|
# The messaging library (messaging-library repo, Maven group dev.cakit.messaging), one version for
|
|
# every module of it: a release publishes all of them together. Raise it by the procedure in
|
|
# docs/work/reference/related-repos.md 3절 (lockfiles rewritten, the leaves' lanes, the CHANGELOG).
|
|
messagingLibrary = "1.0.0"
|
|
okhttp = "4.12.0"
|
|
# Pinned (see `pinned-*` below). CVE-2025-67030, fixed in 3.6.1 on the 3.x line. Brought by the
|
|
# Checkstyle tool's doxia (3.3.0).
|
|
plexusUtils = "3.6.1"
|
|
# The second live protobuf version (the messaging library's schema codec pins the third, 4.33.2, in its
|
|
# own repository since 2026-11-08). adapter:inbound:grpc
|
|
# imports protobuf-bom at this major to match the gRPC BOM above; it is read through
|
|
# `ext.protobufVersion`. Keep it at the protobuf-java that grpc-protobuf of that BOM declares: the
|
|
# protobuf-bom import is what resolves, so a lower number here would run gRPC on an older runtime
|
|
# than it was built against.
|
|
protobufGrpc = "3.25.8"
|
|
# The websocket leaf's proto contract is generated against an older runtime and has not been
|
|
# requalified; see the coordinate's own comment in that leaf.
|
|
protobufLegacy = "4.29.3"
|
|
resilience4j = "2.2.0"
|
|
# Pinned (see `pinned-*` below). CVE-2026-93451 and CVE-2026-108106, fixed in 1.1.10.9. Brought by
|
|
# kafka-clients (1.1.10.7).
|
|
snappyJava = "1.1.10.9"
|
|
# Two Groovy generations, deliberately not merged. See the header.
|
|
spockGroovy4 = "2.3-groovy-4.0"
|
|
spockGroovy5 = "2.4-groovy-5.0"
|
|
# SpotBugs *tool* version (the `spotbugs` extension). The plugin that runs it is spotbugsPlugin.
|
|
spotbugs = "4.10.2"
|
|
spotbugsPlugin = "6.5.6"
|
|
spotless = "8.6.0"
|
|
springBoot = "4.0.9"
|
|
springCloudContext = "4.1.4"
|
|
# The version that actually resolves. Spring Boot 4.0.9's own plugin brings
|
|
# dependency-management 1.1.7, so the 1.1.6 that used to be written here was a floor nothing ever
|
|
# selected (`./gradlew buildEnvironment` reported `1.1.6 -> 1.1.7`). build-logic applies the plugin
|
|
# too and has no Boot plugin to upgrade it, so a catalog stating a version nobody resolves would
|
|
# have given the convention plugins a different one from the leaves.
|
|
springDependencyManagement = "1.1.7"
|
|
springDotenv = "4.0.0"
|
|
springdoc = "3.0.0"
|
|
toxiproxy = "2.1.7"
|
|
uuidCreator = "6.1.1"
|
|
|
|
[libraries]
|
|
approvaltests = { module = "com.approvaltests:approvaltests", version.ref = "approvaltests" }
|
|
assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj" }
|
|
archunit-junit5 = { module = "com.tngtech.archunit:archunit-junit5", version.ref = "archunit" }
|
|
errorprone-core = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" }
|
|
findsecbugs-plugin = { module = "com.h3xstream.findsecbugs:findsecbugs-plugin", version.ref = "findsecbugs" }
|
|
jackson-databind-nullable = { module = "org.openapitools:jackson-databind-nullable", version = "0.2.6" }
|
|
jackson3-core = { module = "tools.jackson.core:jackson-core", version.ref = "jackson3" }
|
|
jackson3-databind = { module = "tools.jackson.core:jackson-databind", version.ref = "jackson3" }
|
|
jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
|
|
jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
|
|
jqwik = { module = "net.jqwik:jqwik", version.ref = "jqwik" }
|
|
json-schema-validator = { module = "com.networknt:json-schema-validator", version.ref = "jsonSchemaValidator" }
|
|
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junitJupiter" }
|
|
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junitPlatform" }
|
|
logstash-logback-encoder = { module = "net.logstash.logback:logstash-logback-encoder", version.ref = "logstashLogbackEncoder" }
|
|
# The messaging library's modules the leaves use. Each leaf's registry row lists the ones it may
|
|
# reach in `allowed_libraries` (gradle/modules.json).
|
|
messaging-core-api = { module = "dev.cakit.messaging:messaging-core-api", version.ref = "messagingLibrary" }
|
|
messaging-reliability = { module = "dev.cakit.messaging:messaging-reliability", version.ref = "messagingLibrary" }
|
|
messaging-reliability-api = { module = "dev.cakit.messaging:messaging-reliability-api", version.ref = "messagingLibrary" }
|
|
messaging-reliability-jdbc-postgresql = { module = "dev.cakit.messaging:messaging-reliability-jdbc-postgresql", version.ref = "messagingLibrary" }
|
|
messaging-spring-boot-starter = { module = "dev.cakit.messaging:messaging-spring-boot-starter", version.ref = "messagingLibrary" }
|
|
messaging-spring-boot-starter-kafka = { module = "dev.cakit.messaging:messaging-spring-boot-starter-kafka", version.ref = "messagingLibrary" }
|
|
mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
|
|
okhttp-tls = { module = "com.squareup.okhttp3:okhttp-tls", version.ref = "okhttp" }
|
|
protobuf-java-legacy = { module = "com.google.protobuf:protobuf-java", version.ref = "protobufLegacy" }
|
|
resilience4j-bulkhead = { module = "io.github.resilience4j:resilience4j-bulkhead", version.ref = "resilience4j" }
|
|
resilience4j-circuitbreaker = { module = "io.github.resilience4j:resilience4j-circuitbreaker", version.ref = "resilience4j" }
|
|
resilience4j-micrometer = { module = "io.github.resilience4j:resilience4j-micrometer", version.ref = "resilience4j" }
|
|
resilience4j-ratelimiter = { module = "io.github.resilience4j:resilience4j-ratelimiter", version.ref = "resilience4j" }
|
|
resilience4j-retry = { module = "io.github.resilience4j:resilience4j-retry", version.ref = "resilience4j" }
|
|
spock-core-groovy4 = { module = "org.spockframework:spock-core", version.ref = "spockGroovy4" }
|
|
spock-core-groovy5 = { module = "org.spockframework:spock-core", version.ref = "spockGroovy5" }
|
|
spring-cloud-context = { module = "org.springframework.cloud:spring-cloud-context", version.ref = "springCloudContext" }
|
|
spring-dotenv = { module = "me.paulschwarz:spring-dotenv", version.ref = "springDotenv" }
|
|
springdoc-openapi-starter-webmvc-api = { module = "org.springdoc:springdoc-openapi-starter-webmvc-api", version.ref = "springdoc" }
|
|
toxiproxy-java = { module = "eu.rekawek.toxiproxy:toxiproxy-java", version.ref = "toxiproxy" }
|
|
uuid-creator = { module = "com.github.f4b6a3:uuid-creator", version.ref = "uuidCreator" }
|
|
|
|
# Pinned: libraries no leaf declares, whose upstream still brings a version with a High or Critical
|
|
# advisory (the trivy gate, scripts/ci/trivy-scan.sh). Not for a leaf to depend on: build-logic's
|
|
# JavaConventionsPlugin pins every `pinned-*` entry, through Spring dependency management, in every
|
|
# configuration of every leaf — the Checkstyle and Error Prone classpaths included. The version's
|
|
# comment names the advisory and the upstream; delete the entry once every upstream named there
|
|
# brings a fixed version itself.
|
|
pinned-guava = { module = "com.google.guava:guava", version.ref = "guava" }
|
|
pinned-lz4-java = { module = "at.yawk.lz4:lz4-java", version.ref = "lz4Java" }
|
|
pinned-plexus-utils = { module = "org.codehaus.plexus:plexus-utils", version.ref = "plexusUtils" }
|
|
pinned-snappy-java = { module = "org.xerial.snappy:snappy-java", version.ref = "snappyJava" }
|
|
|
|
# Plugin coordinates for the root `plugins {}` block. Declared here so that a plugin version and the
|
|
# library version it governs cannot drift in two files — errorprone is the live example: the plugin
|
|
# (errorpronePlugin) and the checker jar it puts on the compile classpath (errorprone, referenced by
|
|
# libs.errorprone.core below) are now one screen apart.
|
|
#
|
|
# The convention plugins from the included build (`ca.*`) are NOT here and cannot be: an included
|
|
# build supplies the plugin itself, so there is no coordinate and no version to pin.
|
|
[plugins]
|
|
spring-boot = { id = "org.springframework.boot", version.ref = "springBoot" }
|
|
spring-dependency-management = { id = "io.spring.dependency-management", version.ref = "springDependencyManagement" }
|
|
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
|
|
spotbugs = { id = "com.github.spotbugs", version.ref = "spotbugsPlugin" }
|
|
errorprone = { id = "net.ltgt.errorprone", version.ref = "errorpronePlugin" }
|
|
jmh = { id = "me.champeau.jmh", version.ref = "jmhPlugin" }
|