From 2c3c517c1ff889836c894f8ecf60bdf80f7fab40 Mon Sep 17 00:00:00 2001 From: Nikita Smirnov <46124551+Nikita-Smirnov-Exactpro@users.noreply.github.com> Date: Thu, 30 May 2024 08:39:33 +0400 Subject: [PATCH] Migrate to th2 gradle plugin `0.0.8` (#366) * Updated common: `5.12.0-dev` * Updated jaxb-runtime: `2.3.9` * '2.3.9' version has 'EDL 1.0' license instead of 'CDDL GPL 1.1' in the '2.3.1' --- README.md | 6 ++++++ build.gradle | 13 +++++++++---- gradle.properties | 6 ++---- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index eb788498..b0e330ee 100644 --- a/README.md +++ b/README.md @@ -295,6 +295,12 @@ spec: # Release notes +## 5.12.0 +* Migrate to th2 gradle plugin `0.0.8` +* Updated common: `5.12.0-dev` +* Updated jaxb-runtime: `2.3.9` + * '2.3.9' version has 'EDL 1.0' license instead of 'CDDL GPL 1.1' in the '2.3.1' + ## 5.11.0 + Migrate to th2 gradle plugin `0.0.6` + Updated bom: `4.6.1` diff --git a/build.gradle b/build.gradle index bb80663e..f2f0a33f 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id 'org.jetbrains.kotlin.jvm' version '1.8.22' - id "com.exactpro.th2.gradle.component" version "0.0.6" + id "com.exactpro.th2.gradle.component" version "0.0.8" id 'application' } @@ -46,7 +46,7 @@ dependencies { implementation 'org.apache.commons:commons-lang3' - implementation('com.exactpro.th2:common:5.11.0-dev') { + implementation('com.exactpro.th2:common:5.12.0-dev') { exclude group: 'com.exactpro.th2', module: 'cradle-core' exclude group: 'com.exactpro.th2', module: 'cradle-cassandra' } @@ -62,9 +62,14 @@ dependencies { implementation 'io.prometheus:simpleclient' - implementation 'io.ktor:ktor-server-netty:2.3.3' - implementation 'io.ktor:ktor-server:2.3.3' + implementation(platform('io.ktor:ktor-bom:2.3.3')) + implementation 'io.ktor:ktor-server-netty' + implementation 'io.ktor:ktor-server' + implementation 'org.ehcache:ehcache:3.8.1' + implementation('org.glassfish.jaxb:jaxb-runtime:2.3.9') { + because("'2.3.9' version has 'EDL 1.0' license instead of 'CDDL GPL 1.1' in the '2.3.1'") + } testImplementation('io.mockk:mockk:1.12.4') { // The last version bases on kotlin 1.6.0 exclude group: 'org.jetbrains.kotlin', module: 'kotlin-reflect' // because we need kotlin reflect with different version diff --git a/gradle.properties b/gradle.properties index fd1da648..83f77591 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,5 @@ ################################################################################ kotlin.code.style=official - -release_version=5.11.0 - -docker_image_name= +release_version=5.12.0 +docker_image_name= \ No newline at end of file