diff --git a/.editorconfig b/.editorconfig index 7bd3308..fe75bbd 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,7 +9,7 @@ insert_final_newline = true max_line_length = 120 tab_width = 4 -[*.{md,yml}] +[*.{md,json,yml}] max_line_length = 1024 indent_size = 2 tab_width = 2 @@ -19,12 +19,14 @@ end_of_line = crlf # noinspection EditorConfigKeyCorrectness [*.{kt,kts}] -ij_kotlin_packages_to_use_import_on_demand = unset -ij_kotlin_allow_trailing_comma_on_call_site = true ij_kotlin_allow_trailing_comma = true -ktlint_standard_import-ordering = disabled -ktlint_standard_no-empty-first-line-in-class-body = disabled +ij_kotlin_allow_trailing_comma_on_call_site = true +ij_kotlin_packages_to_use_import_on_demand = unset +ktlint_standard_chain-method-continuation = disabled +ktlint_standard_class-signature = disabled ktlint_standard_function-signature = disabled -ktlint_standard_parameter-list-wrapping = disabled +ktlint_standard_import-ordering = disabled ktlint_standard_multiline-expression-wrapping = disabled +ktlint_standard_no-empty-first-line-in-class-body = disabled +ktlint_standard_parameter-list-wrapping = disabled ktlint_standard_string-template-indent = disabled diff --git a/README.md b/README.md index eb6a41e..6b5c124 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ {description} -## Properties for deployment +## Properties For Deployment | Name | Required | Information | |------------------------|:--------:|-------------------------| @@ -12,7 +12,7 @@ ## Releasing Service -Run `release.sh` script from `master` branch. +Run release pipeline from `master` branch. ## Development Configuration diff --git a/build.gradle.kts b/build.gradle.kts index 9f71229..7b6b273 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,9 +1,9 @@ plugins { alias(hlaeja.plugins.kotlin.jvm) alias(hlaeja.plugins.kotlin.spring) - 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.service) } dependencies { diff --git a/gradle.properties b/gradle.properties index 91e878c..5a408d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official version=0.1.0-SNAPSHOT -catalog=0.10.0 +catalog=0.11.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975..1b33c55 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b..d4081da 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index faf9300..23d15a9 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a21..db3a6ac 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..26fe8e1 --- /dev/null +++ b/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,24 @@ +{ + "properties": [ + { + "name": "spring.application.version", + "type": "java.lang.String", + "description": "Application version." + }, + { + "name": "spring.application.build.time", + "type": "java.lang.String", + "description": "Application build time." + }, + { + "name": "spring.application.build.os.name", + "type": "java.lang.String", + "description": "Application build os name." + }, + { + "name": "spring.application.build.os.version", + "type": "java.lang.String", + "description": "Application build os version." + } + ] +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d0157d2..abb83de 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,21 +1,28 @@ spring: application: - name: hlaeja-service + name: "%APP_NAME%" + version: "%APP_VERSION%" + build: + time: "%APP_BUILD_TIME%" + os: + name: "%APP_BUILD_OS_NAME%" + version: "%APP_BUILD_OS_VERSION%" profiles: active: development management: endpoints: - enabled-by-default: false + access: + default: none web: exposure: include: "health,info" endpoint: health: - enabled: true show-details: always + access: read_only info: - enabled: true + access: read_only --- ############################### diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt new file mode 100644 index 0000000..f3c740c --- /dev/null +++ b/src/main/resources/banner.txt @@ -0,0 +1,13 @@ + + _/ _/ _/ _/ _/_/_/ _/ + _/ _/ _/ _/_/_/ _/_/ _/_/_/ _/ _/_/ _/ _/_/ _/ _/ _/_/_/ _/_/ + _/_/_/_/ _/ _/ _/_/_/_/_/ _/ _/ _/ _/_/ _/_/_/_/ _/_/ _/ _/ _/ _/ _/_/_/_/ + _/ _/ _/ _/ _/_/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ + _/ _/ _/ _/_/_/ _/_/_/ _/ _/_/_/ _/_/_/ _/_/_/ _/ _/ _/ _/_/_/ _/_/_/ + _/ + _/ + + :: Service :: ${spring.application.name} + :: Version :: ${spring.application.version} + :: Build time :: ${spring.application.build.time} + :: Build OS :: ${spring.application.build.os.name} v${spring.application.build.os.version} 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/test/kotlin/ltd/hlaeja/ApplicationTests.kt b/src/test/kotlin/ltd/hlaeja/ApplicationTests.kt index 1af5ea1..04ae6d6 100644 --- a/src/test/kotlin/ltd/hlaeja/ApplicationTests.kt +++ b/src/test/kotlin/ltd/hlaeja/ApplicationTests.kt @@ -8,6 +8,6 @@ class ApplicationTests { @Test fun contextLoads() { + // placeholder } - }