Merge branch 'dev' into route-processing

Conflict resolution:
- build.gradle.kts: dev version (keep nstart.cloud repo + jacoco/asm mavenCentral)
- settings.gradle.kts: project name from route-processing (observatio-terrae), rest from dev
- config addresses (application-local, pcp-mission-planing-service, pcp-dynamic-plan application.yaml): dev versions
- menu.html: merged both branches (TGU planning + bookings items)
- CatalogControllerTest.kt: merged both mocks (TguPlanningService + BallisticsService)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Дмитрий Соловьев
2026-06-01 09:19:29 +03:00
120 changed files with 5180 additions and 345 deletions
+5 -6
View File
@@ -24,15 +24,13 @@ include(":services:pcp-dynamic-plan-service")
include(":services:spring-cloud-config-server")
include(":services:pcp-srpring-boot-admin-server")
// include(":workers:worker-example")
pluginManagement {
repositories {
maven {
url = uri("https://repo.nstart.cloud/repository/maven-proxy/")
}
mavenCentral()
gradlePluginPortal()
maven {
url = uri("https://repo.nstart.local/repository/maven-proxy/")
}
}
val versions_kotlin : String by settings
@@ -41,6 +39,7 @@ pluginManagement {
val versions_sonarqube : String by settings
val versions_buildtools : String by settings
plugins {
kotlin("jvm") version versions_kotlin
kotlin("plugin.spring") version versions_kotlin
@@ -48,7 +47,7 @@ pluginManagement {
kotlin("plugin.lombok") version versions_kotlin
id("org.springframework.boot") version versions_spring_boot
id("io.spring.dependency-management") version versions_spring_dependency
id("org.sonarqube") version versions_sonarqube
// //id("org.sonarqube") version versions_sonarqube
// id("org.graalvm.buildtools.native") version versions_buildtools
}
}