From 5d735ccfbe5dd8270e74c35a0de470dc84524c36 Mon Sep 17 00:00:00 2001 From: Swordsteel Date: Tue, 29 Jul 2025 09:51:49 +0200 Subject: [PATCH] update project --- build.gradle.kts | 20 +++++++++---------- gradle.properties | 2 +- src/main/resources/application.yml | 14 +++++++++++++ .../{logback.xml => logback-spring.xml} | 0 src/main/resources/logback-test.xml | 11 ---------- .../kotlin/ltd/hlaeja/ApplicationTests.kt | 0 .../ltd/hlaeja/controller/DeviceEndpoint.kt | 0 .../ltd/hlaeja/controller/IdentityEndpoint.kt | 0 .../ltd/hlaeja/controller/NodeEndpoint.kt | 0 .../ltd/hlaeja/controller/TypeEndpoint.kt | 0 .../ltd/hlaeja/controller/TypesEndpoint.kt | 0 .../resources/application.yml | 0 .../resources/cert/valid-private-key.pem | 0 .../resources/identity/first-device.data | 0 .../resources/postgres/data.sql | 0 .../resources/postgres/reset.sql | 0 .../resources/postgres/schema.sql | 0 17 files changed, 25 insertions(+), 22 deletions(-) rename src/main/resources/{logback.xml => logback-spring.xml} (100%) delete mode 100644 src/main/resources/logback-test.xml rename src/{integration-test => test-integration}/kotlin/ltd/hlaeja/ApplicationTests.kt (100%) rename src/{integration-test => test-integration}/kotlin/ltd/hlaeja/controller/DeviceEndpoint.kt (100%) rename src/{integration-test => test-integration}/kotlin/ltd/hlaeja/controller/IdentityEndpoint.kt (100%) rename src/{integration-test => test-integration}/kotlin/ltd/hlaeja/controller/NodeEndpoint.kt (100%) rename src/{integration-test => test-integration}/kotlin/ltd/hlaeja/controller/TypeEndpoint.kt (100%) rename src/{integration-test => test-integration}/kotlin/ltd/hlaeja/controller/TypesEndpoint.kt (100%) rename src/{integration-test => test-integration}/resources/application.yml (100%) rename src/{integration-test => test-integration}/resources/cert/valid-private-key.pem (100%) rename src/{integration-test => test-integration}/resources/identity/first-device.data (100%) rename src/{integration-test => test-integration}/resources/postgres/data.sql (100%) rename src/{integration-test => test-integration}/resources/postgres/reset.sql (100%) rename src/{integration-test => test-integration}/resources/postgres/schema.sql (100%) diff --git a/build.gradle.kts b/build.gradle.kts index 283ebd1..859ade2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,10 @@ plugins { alias(hlaeja.plugins.kotlin.jvm) alias(hlaeja.plugins.kotlin.spring) - alias(hlaeja.plugins.ltd.hlaeja.plugin.certificate) - alias(hlaeja.plugins.ltd.hlaeja.plugin.service) + alias(hlaeja.plugins.spring.boot) alias(hlaeja.plugins.spring.dependency.management) - alias(hlaeja.plugins.springframework.boot) + alias(hlaeja.plugins.certificate) + alias(hlaeja.plugins.service) } dependencies { @@ -31,14 +31,14 @@ dependencies { testRuntimeOnly(hlaeja.junit.platform.launcher) - integrationTestImplementation(hlaeja.assertj.core) - integrationTestImplementation(hlaeja.library.test) - integrationTestImplementation(hlaeja.projectreactor.reactor.test) - integrationTestImplementation(hlaeja.kotlin.test.junit5) - integrationTestImplementation(hlaeja.kotlinx.coroutines.test) - integrationTestImplementation(hlaeja.springboot.starter.test) + testIntegrationImplementation(hlaeja.assertj.core) + testIntegrationImplementation(hlaeja.library.test) + testIntegrationImplementation(hlaeja.projectreactor.reactor.test) + testIntegrationImplementation(hlaeja.kotlin.test.junit5) + testIntegrationImplementation(hlaeja.kotlinx.coroutines.test) + testIntegrationImplementation(hlaeja.springboot.starter.test) - integrationTestRuntimeOnly(hlaeja.junit.platform.launcher) + testIntegrationRuntimeOnly(hlaeja.junit.platform.launcher) } group = "ltd.hlaeja" diff --git a/gradle.properties b/gradle.properties index f9c47a2..1995489 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ kotlin.code.style=official version=0.6.0-SNAPSHOT -catalog=0.10.0 +catalog=0.11.0-SNAPSHOT container.port.host=9010 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 85d11ed..55a119e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,6 +10,20 @@ spring: name: "%APP_BUILD_OS_NAME%" version: "%APP_BUILD_OS_VERSION%" +management: + endpoints: + access: + default: none + web: + exposure: + include: "health,info" + endpoint: + health: + show-details: always + access: read_only + info: + access: read_only + jwt: private-key: cert/private_key.pem diff --git a/src/main/resources/logback.xml b/src/main/resources/logback-spring.xml similarity index 100% rename from src/main/resources/logback.xml rename to src/main/resources/logback-spring.xml diff --git a/src/main/resources/logback-test.xml b/src/main/resources/logback-test.xml deleted file mode 100644 index 3d69919..0000000 --- a/src/main/resources/logback-test.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - diff --git a/src/integration-test/kotlin/ltd/hlaeja/ApplicationTests.kt b/src/test-integration/kotlin/ltd/hlaeja/ApplicationTests.kt similarity index 100% rename from src/integration-test/kotlin/ltd/hlaeja/ApplicationTests.kt rename to src/test-integration/kotlin/ltd/hlaeja/ApplicationTests.kt diff --git a/src/integration-test/kotlin/ltd/hlaeja/controller/DeviceEndpoint.kt b/src/test-integration/kotlin/ltd/hlaeja/controller/DeviceEndpoint.kt similarity index 100% rename from src/integration-test/kotlin/ltd/hlaeja/controller/DeviceEndpoint.kt rename to src/test-integration/kotlin/ltd/hlaeja/controller/DeviceEndpoint.kt diff --git a/src/integration-test/kotlin/ltd/hlaeja/controller/IdentityEndpoint.kt b/src/test-integration/kotlin/ltd/hlaeja/controller/IdentityEndpoint.kt similarity index 100% rename from src/integration-test/kotlin/ltd/hlaeja/controller/IdentityEndpoint.kt rename to src/test-integration/kotlin/ltd/hlaeja/controller/IdentityEndpoint.kt diff --git a/src/integration-test/kotlin/ltd/hlaeja/controller/NodeEndpoint.kt b/src/test-integration/kotlin/ltd/hlaeja/controller/NodeEndpoint.kt similarity index 100% rename from src/integration-test/kotlin/ltd/hlaeja/controller/NodeEndpoint.kt rename to src/test-integration/kotlin/ltd/hlaeja/controller/NodeEndpoint.kt diff --git a/src/integration-test/kotlin/ltd/hlaeja/controller/TypeEndpoint.kt b/src/test-integration/kotlin/ltd/hlaeja/controller/TypeEndpoint.kt similarity index 100% rename from src/integration-test/kotlin/ltd/hlaeja/controller/TypeEndpoint.kt rename to src/test-integration/kotlin/ltd/hlaeja/controller/TypeEndpoint.kt diff --git a/src/integration-test/kotlin/ltd/hlaeja/controller/TypesEndpoint.kt b/src/test-integration/kotlin/ltd/hlaeja/controller/TypesEndpoint.kt similarity index 100% rename from src/integration-test/kotlin/ltd/hlaeja/controller/TypesEndpoint.kt rename to src/test-integration/kotlin/ltd/hlaeja/controller/TypesEndpoint.kt diff --git a/src/integration-test/resources/application.yml b/src/test-integration/resources/application.yml similarity index 100% rename from src/integration-test/resources/application.yml rename to src/test-integration/resources/application.yml diff --git a/src/integration-test/resources/cert/valid-private-key.pem b/src/test-integration/resources/cert/valid-private-key.pem similarity index 100% rename from src/integration-test/resources/cert/valid-private-key.pem rename to src/test-integration/resources/cert/valid-private-key.pem diff --git a/src/integration-test/resources/identity/first-device.data b/src/test-integration/resources/identity/first-device.data similarity index 100% rename from src/integration-test/resources/identity/first-device.data rename to src/test-integration/resources/identity/first-device.data diff --git a/src/integration-test/resources/postgres/data.sql b/src/test-integration/resources/postgres/data.sql similarity index 100% rename from src/integration-test/resources/postgres/data.sql rename to src/test-integration/resources/postgres/data.sql diff --git a/src/integration-test/resources/postgres/reset.sql b/src/test-integration/resources/postgres/reset.sql similarity index 100% rename from src/integration-test/resources/postgres/reset.sql rename to src/test-integration/resources/postgres/reset.sql diff --git a/src/integration-test/resources/postgres/schema.sql b/src/test-integration/resources/postgres/schema.sql similarity index 100% rename from src/integration-test/resources/postgres/schema.sql rename to src/test-integration/resources/postgres/schema.sql