Skip to content

Commit 93042fb

Browse files
GoodforGodGoodforGod
authored
Merge pull request #3 from kora-projects/feature/1.2.3
1.2.3
2 parents ffadab6 + 5242c62 commit 93042fb

14 files changed

Lines changed: 81 additions & 56 deletions

File tree

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG RUN_IMAGE=eclipse-temurin:21-jre-jammy
1+
ARG RUN_IMAGE=eclipse-temurin:25-jre-jammy
22
FROM ${RUN_IMAGE}
33

44
ARG TARGET_DIR=/opt/app

‎build.gradle‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,11 @@ plugins {
99
group = groupId
1010
version = koraVersion
1111

12-
application {
13-
applicationName = "application"
14-
mainClassName = "ru.tinkoff.kora.java.Application"
15-
applicationDefaultJvmArgs = ["-Dfile.encoding=UTF-8"]
12+
java {
13+
sourceCompatibility = JavaVersion.VERSION_21
14+
targetCompatibility = JavaVersion.VERSION_21
1615
}
1716

18-
sourceCompatibility = JavaVersion.VERSION_21
19-
targetCompatibility = JavaVersion.VERSION_21
20-
2117
repositories {
2218
mavenCentral()
2319
maven { url "https://central.sonatype.com/repository/maven-snapshots" }
@@ -29,14 +25,15 @@ configurations {
2925
compileOnly.extendsFrom(koraBom)
3026
implementation.extendsFrom(koraBom)
3127
api.extendsFrom(koraBom)
28+
testImplementation.extendsFrom(koraBom)
29+
testAnnotationProcessor.extendsFrom(koraBom)
3230
}
3331

3432
dependencies {
3533
koraBom platform("ru.tinkoff.kora:kora-parent:$koraVersion")
3634
annotationProcessor "ru.tinkoff.kora:annotation-processors"
3735

3836
implementation "ru.tinkoff.kora:http-server-undertow"
39-
implementation "ru.tinkoff.kora:micrometer-module"
4037
implementation "ru.tinkoff.kora:config-hocon"
4138
implementation "ru.tinkoff.kora:logging-logback"
4239

@@ -45,6 +42,12 @@ dependencies {
4542
testImplementation "org.testcontainers:junit-jupiter:1.19.8"
4643
}
4744

45+
application {
46+
applicationName = "application"
47+
mainClass = "ru.tinkoff.kora.example.Application"
48+
applicationDefaultJvmArgs = ["-Dfile.encoding=UTF-8"]
49+
}
50+
4851
//noinspection GroovyAssignabilityCheck
4952
run {
5053
environment([
@@ -75,8 +78,10 @@ test {
7578
exceptionFormat("full")
7679
}
7780

81+
exclude("**/\$*")
82+
7883
jacoco {
79-
excludes += ["**/Application*"]
84+
excludes += ["**/generated/**", "**/Application*", "**/\$*"]
8085
}
8186

8287
reports {
@@ -91,6 +96,7 @@ jacocoTestReport {
9196
xml.required = true
9297
html.outputLocation = layout.buildDirectory.dir("jacocoHtml")
9398
}
99+
classDirectories = files(classDirectories.files.collect { fileTree(dir: it, excludes: test.jacoco.excludes) })
94100
}
95101

96102
compileJava {

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
groupId=ru.tinkoff.kora
2-
koraVersion=1.2.0
2+
koraVersion=1.2.3
33

44

55
##### GRADLE #####

‎gradle/wrapper/gradle-wrapper.jar‎

-14.9 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 26 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 14 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/ru/tinkoff/kora/java/Application.java renamed to src/main/java/ru/tinkoff/kora/example/Application.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
package ru.tinkoff.kora.java;
1+
package ru.tinkoff.kora.example;
22

33
import ru.tinkoff.kora.application.graph.KoraApplication;
44
import ru.tinkoff.kora.common.KoraApp;
55
import ru.tinkoff.kora.config.hocon.HoconConfigModule;
66
import ru.tinkoff.kora.http.server.undertow.UndertowModule;
77
import ru.tinkoff.kora.logging.logback.LogbackModule;
8-
import ru.tinkoff.kora.micrometer.module.MetricsModule;
98

109
@KoraApp
1110
public interface Application extends
1211
UndertowModule, // only private server for health & metrics
13-
MetricsModule,
1412
HoconConfigModule,
1513
LogbackModule {
1614

src/main/java/ru/tinkoff/kora/java/SomeService.java renamed to src/main/java/ru/tinkoff/kora/example/SomeService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package ru.tinkoff.kora.java;
1+
package ru.tinkoff.kora.example;
22

33
import ru.tinkoff.kora.common.Component;
44
import ru.tinkoff.kora.common.annotation.Root;
55

6+
//TODO remove this class
67
@Root
78
@Component
89
public final class SomeService {

‎src/main/resources/application.conf‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ httpServer {
99

1010
logging.level {
1111
"root": "WARN"
12+
"root": ${?LOGGING_LEVEL_ALL}
13+
"root": ${?LOGGING_LEVEL_ROOT}
14+
1215
"ru.tinkoff.kora": "INFO"
13-
"ru.tinkoff.kora.java": "INFO"
16+
"ru.tinkoff.kora": ${?LOGGING_LEVEL_ALL}
17+
"ru.tinkoff.kora": ${?LOGGING_LEVEL_KORA}
18+
19+
"ru.tinkoff.kora.example": "INFO"
20+
"ru.tinkoff.kora.example": ${?LOGGING_LEVEL_ALL}
21+
"ru.tinkoff.kora.example": ${?LOGGING_LEVEL_APP}
1422
}

0 commit comments

Comments
 (0)