Skip to content

Commit

Permalink
Migrate to th2 gradle plugin 0.0.8 (#366)
Browse files Browse the repository at this point in the history
* 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'
  • Loading branch information
Nikita-Smirnov-Exactpro authored May 30, 2024
1 parent 04c9c8b commit 2c3c517
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 8 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
13 changes: 9 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down Expand Up @@ -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'
}
Expand All @@ -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
Expand Down
6 changes: 2 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,5 @@
################################################################################

kotlin.code.style=official

release_version=5.11.0

docker_image_name=
release_version=5.12.0
docker_image_name=

0 comments on commit 2c3c517

Please sign in to comment.