Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "com.diffplug.spotless" version "6.19.0"
id "org.graalvm.buildtools.native" version "0.11.0" // or dependsOn fails in graalvm examples
id "com.asarkar.gradle.build-time-tracker" version "4.3.0"
id "org.graalvm.buildtools.native" version "0.11.1" apply false // or dependsOn fails in graalvm examples
id "org.jetbrains.kotlin.jvm" version "1.9.25" apply false
id "org.jetbrains.kotlin.kapt" version "1.9.25" apply false
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
groupId=ru.tinkoff.kora
koraVersion=1.2.2
koraVersion=1.2.3


##### GRADLE #####
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
12 changes: 7 additions & 5 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion kora-java-cache-caffeine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUN_IMAGE=eclipse-temurin:17-jre-jammy
ARG RUN_IMAGE=eclipse-temurin:25-jre-jammy
FROM ${RUN_IMAGE}

ARG TARGET_DIR=/opt/app
Expand Down
24 changes: 13 additions & 11 deletions kora-java-cache-caffeine/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,10 @@ plugins {
id "application"
}

applicationName = "application"
mainClassName = "ru.tinkoff.kora.example.cache.caffeine.Application"

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

configurations {
koraBom
annotationProcessor.extendsFrom(koraBom)
compileOnly.extendsFrom(koraBom)
implementation.extendsFrom(koraBom)
api.extendsFrom(koraBom)
annotationProcessor.extendsFrom(koraBom); compileOnly.extendsFrom(koraBom); implementation.extendsFrom(koraBom)
api.extendsFrom(koraBom); testImplementation.extendsFrom(koraBom); testAnnotationProcessor.extendsFrom(koraBom)
}

dependencies {
Expand All @@ -30,7 +22,14 @@ dependencies {
testImplementation "ru.tinkoff.kora:test-junit5"
}

java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

application {
applicationName = "application"
mainClass = "ru.tinkoff.kora.example.cache.caffeine.Application"
applicationDefaultJvmArgs = ["-Dfile.encoding=UTF-8"]
}

Expand Down Expand Up @@ -64,8 +63,10 @@ test {
exceptionFormat("full")
}

exclude("**/\$*")

jacoco {
excludes += ["**/Application*"]
excludes += ["**/generated/**", "**/Application*", "**/\$*"]
}

reports {
Expand All @@ -86,6 +87,7 @@ jacocoTestReport {
xml.required = true
html.outputLocation = layout.buildDirectory.dir("jacocoHtml")
}
classDirectories = files(classDirectories.files.collect { fileTree(dir: it, excludes: test.jacoco.excludes) })
}

javadoc {
Expand Down
5 changes: 1 addition & 4 deletions kora-java-cache-caffeine/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,5 @@
<root level="WARN">
<appender-ref ref="ASYNC"/>
</root>

<logger level="INFO" name="ru.tinkoff.kora"/>

<logger level="DEBUG" name="ru.tinkoff.kora.example"/>
<!-- Logging levels configured in application.conf -->
</configuration>
2 changes: 1 addition & 1 deletion kora-java-cache-redis/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUN_IMAGE=eclipse-temurin:17-jre-jammy
ARG RUN_IMAGE=eclipse-temurin:25-jre-jammy
FROM ${RUN_IMAGE}

ARG TARGET_DIR=/opt/app
Expand Down
24 changes: 13 additions & 11 deletions kora-java-cache-redis/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,10 @@ plugins {
id "application"
}

applicationName = "application"
mainClassName = "ru.tinkoff.kora.example.cache.redis.Application"

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

configurations {
koraBom
annotationProcessor.extendsFrom(koraBom)
compileOnly.extendsFrom(koraBom)
implementation.extendsFrom(koraBom)
api.extendsFrom(koraBom)
annotationProcessor.extendsFrom(koraBom); compileOnly.extendsFrom(koraBom); implementation.extendsFrom(koraBom)
api.extendsFrom(koraBom); testImplementation.extendsFrom(koraBom); testAnnotationProcessor.extendsFrom(koraBom)
}

dependencies {
Expand All @@ -32,7 +24,14 @@ dependencies {
testImplementation "redis.clients:jedis:4.4.3"
}

java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

application {
applicationName = "application"
mainClass = "ru.tinkoff.kora.example.cache.redis.Application"
applicationDefaultJvmArgs = ["-Dfile.encoding=UTF-8"]
}

Expand Down Expand Up @@ -66,8 +65,10 @@ test {
exceptionFormat("full")
}

exclude("**/\$*")

jacoco {
excludes += ["**/Application*"]
excludes += ["**/generated/**", "**/Application*", "**/\$*"]
}

reports {
Expand All @@ -88,6 +89,7 @@ jacocoTestReport {
xml.required = true
html.outputLocation = layout.buildDirectory.dir("jacocoHtml")
}
classDirectories = files(classDirectories.files.collect { fileTree(dir: it, excludes: test.jacoco.excludes) })
}

javadoc {
Expand Down
5 changes: 1 addition & 4 deletions kora-java-cache-redis/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,5 @@
<root level="WARN">
<appender-ref ref="ASYNC"/>
</root>

<logger level="INFO" name="ru.tinkoff.kora"/>

<logger level="DEBUG" name="ru.tinkoff.kora.example"/>
<!-- Logging levels configured in application.conf -->
</configuration>
2 changes: 1 addition & 1 deletion kora-java-camunda-engine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUN_IMAGE=eclipse-temurin:17-jre-jammy
ARG RUN_IMAGE=eclipse-temurin:25-jre-jammy
FROM ${RUN_IMAGE}

ARG TARGET_DIR=/opt/app
Expand Down
26 changes: 14 additions & 12 deletions kora-java-camunda-engine/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,10 @@ plugins {
id "application"
}

applicationName = "application"
mainClassName = "ru.tinkoff.kora.example.camunda.engine.Application"

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

configurations {
koraBom
annotationProcessor.extendsFrom(koraBom)
compileOnly.extendsFrom(koraBom)
implementation.extendsFrom(koraBom)
api.extendsFrom(koraBom)
annotationProcessor.extendsFrom(koraBom); compileOnly.extendsFrom(koraBom); implementation.extendsFrom(koraBom)
api.extendsFrom(koraBom); testImplementation.extendsFrom(koraBom); testAnnotationProcessor.extendsFrom(koraBom)
}

dependencies {
Expand All @@ -40,7 +32,14 @@ dependencies {
testImplementation "org.assertj:assertj-core:3.26.0"
}

java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

application {
applicationName = "application"
mainClass = "ru.tinkoff.kora.example.camunda.engine.Application"
applicationDefaultJvmArgs = ["-Dfile.encoding=UTF-8"]
}

Expand All @@ -59,7 +58,7 @@ distTar {

test {
dependsOn tasks.distTar

jvmArgs += [
"-XX:+TieredCompilation",
"-XX:TieredStopAtLevel=1",
Expand All @@ -76,8 +75,10 @@ test {
exceptionFormat("full")
}

exclude("**/\$*")

jacoco {
excludes += ["**/Application*"]
excludes += ["**/generated/**", "**/Application*", "**/\$*"]
}

reports {
Expand All @@ -98,6 +99,7 @@ jacocoTestReport {
xml.required = true
html.outputLocation = layout.buildDirectory.dir("jacocoHtml")
}
classDirectories = files(classDirectories.files.collect { fileTree(dir: it, excludes: test.jacoco.excludes) })
}

javadoc {
Expand Down
5 changes: 1 addition & 4 deletions kora-java-camunda-engine/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,5 @@
<root level="WARN">
<appender-ref ref="ASYNC"/>
</root>

<logger level="INFO" name="ru.tinkoff.kora"/>

<logger level="DEBUG" name="ru.tinkoff.kora.example"/>
<!-- Logging levels configured in application.conf -->
</configuration>
2 changes: 1 addition & 1 deletion kora-java-camunda-zeebe-worker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUN_IMAGE=eclipse-temurin:17-jre-jammy
ARG RUN_IMAGE=eclipse-temurin:25-jre-jammy
FROM ${RUN_IMAGE}

ARG TARGET_DIR=/opt/app
Expand Down
6 changes: 5 additions & 1 deletion kora-java-camunda-zeebe-worker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ docker build -t kora-java-camunda-zeebe-worker .

## Run Docker-Compose

Требуется сначала собрать артефакт.
Требуется сначала собрать артефакт:

```shell
./gradlew distTar
```

Запустить как docker-compose:
```shell
Expand Down
Loading
Loading