diff --git a/bottlenote-admin-api/src/test/resources/docker-java.properties b/bottlenote-admin-api/src/test/resources/docker-java.properties new file mode 100644 index 000000000..d06ebb926 --- /dev/null +++ b/bottlenote-admin-api/src/test/resources/docker-java.properties @@ -0,0 +1 @@ +api.version=1.44 diff --git a/bottlenote-batch/src/test/resources/docker-java.properties b/bottlenote-batch/src/test/resources/docker-java.properties new file mode 100644 index 000000000..d06ebb926 --- /dev/null +++ b/bottlenote-batch/src/test/resources/docker-java.properties @@ -0,0 +1 @@ +api.version=1.44 diff --git a/bottlenote-mono/src/test/resources/docker-java.properties b/bottlenote-mono/src/test/resources/docker-java.properties new file mode 100644 index 000000000..d06ebb926 --- /dev/null +++ b/bottlenote-mono/src/test/resources/docker-java.properties @@ -0,0 +1 @@ +api.version=1.44 diff --git a/bottlenote-product-api/VERSION b/bottlenote-product-api/VERSION index 3cd22829f..b0f3d96f8 100644 --- a/bottlenote-product-api/VERSION +++ b/bottlenote-product-api/VERSION @@ -1 +1 @@ -1.0.7-3 +1.0.8 diff --git a/bottlenote-product-api/src/main/resources/application.yml b/bottlenote-product-api/src/main/resources/application.yml index d16be02ac..9f6246e9b 100644 --- a/bottlenote-product-api/src/main/resources/application.yml +++ b/bottlenote-product-api/src/main/resources/application.yml @@ -29,6 +29,26 @@ spring: jackson: time-zone: Asia/Seoul + # Quartz 설정 (ViewHistorySyncJob 클러스터링) + quartz: + overwrite-existing-jobs: true + job-store-type: jdbc + jdbc: + initialize-schema: never + properties: + org: + quartz: + scheduler: + instanceName: bottle_note_product_quartz_scheduler + instanceId: AUTO + threadPool: + threadCount: 5 + threadPriority: 5 + jobStore: + driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate + isClustered: true + clusterCheckinInterval: 20000 + # Spring Security security: jwt: diff --git a/bottlenote-product-api/src/test/resources/application-test.yml b/bottlenote-product-api/src/test/resources/application-test.yml index 7cb838067..851f81b44 100644 --- a/bottlenote-product-api/src/test/resources/application-test.yml +++ b/bottlenote-product-api/src/test/resources/application-test.yml @@ -3,6 +3,11 @@ spring: allow-bean-definition-overriding: true application: name: bottle-note-test + + # Quartz 비활성화 (테스트 환경) + quartz: + auto-startup: false + job-store-type: memory test: database: replace: none diff --git a/bottlenote-product-api/src/test/resources/docker-java.properties b/bottlenote-product-api/src/test/resources/docker-java.properties new file mode 100644 index 000000000..d06ebb926 --- /dev/null +++ b/bottlenote-product-api/src/test/resources/docker-java.properties @@ -0,0 +1 @@ +api.version=1.44 diff --git a/git.environment-variables b/git.environment-variables index 1581bb6e2..d49f55cc2 160000 --- a/git.environment-variables +++ b/git.environment-variables @@ -1 +1 @@ -Subproject commit 1581bb6e200e599be9eed5c86a4506b69bf90399 +Subproject commit d49f55cc2da2725a7689994ef40f40273ef603a4 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 930899f51..f79363e72 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -39,10 +39,10 @@ firebase-admin = "9.4.3" # Testing testng = "7.7.0" -testcontainers = "1.19.8" -testcontainers-junit = "1.19.8" -testcontainers-mysql = "1.19.8" -testcontainers-minio = "1.19.8" +testcontainers = "1.21.4" +testcontainers-junit = "1.21.4" +testcontainers-mysql = "1.21.4" +testcontainers-minio = "1.21.4" testcontainers-redis = "2.2.4" mockito-inline = "5.2.0" archunit = "1.4.0"