Skip to content

Commit

Permalink
Update bom and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
OptimumCode committed Mar 3, 2024
1 parent aae6325 commit ee7668f
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
id 'java-library'
id 'java-test-fixtures'
id 'maven-publish'
id "io.github.gradle-nexus.publish-plugin" version "1.0.0"
id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
id 'signing'
id 'org.jetbrains.kotlin.jvm' version "${kotlin_version}"
id 'org.jetbrains.kotlin.kapt' version "${kotlin_version}"
Expand All @@ -37,9 +37,9 @@ group = 'com.exactpro.th2'
version = release_version

ext {
grpcVersion = '1.56.0'
protobufVersion = '3.23.2' // The protoc:3.23.3 https://github.com/protocolbuffers/protobuf/issues/13070
serviceGeneratorVersion = '3.5.1'
grpcVersion = '1.62.2'
protobufVersion = '3.25.3'
serviceGeneratorVersion = '3.6.0-th2-5042-8129749597-d00d9fc-SNAPSHOT'

cradleVersion = '5.1.1-dev'
junitVersion = '5.10.0'
Expand Down Expand Up @@ -180,7 +180,7 @@ tasks.register('integrationTest', Test) {
}

dependencies {
api platform("com.exactpro.th2:bom:4.5.0")
api platform("com.exactpro.th2:bom:4.6.0-update-bom-8129602206-434846f-SNAPSHOT")
api('com.exactpro.th2:grpc-common:4.3.0-dev') {
because('protobuf transport is main now, this dependnecy should be moved to grpc, mq protobuf modules after splitting')
}
Expand Down Expand Up @@ -253,11 +253,15 @@ dependencies {
implementation('com.squareup.okhttp3:okhttp:4.11.0') {
because('fix vulnerability in transitive dependency <kubernetes-client>')
}
implementation('com.squareup.okhttp3:logging-interceptor:4.11.0') {
because('fix vulnerability in transitive dependency <kubernetes-client>')
}

implementation('io.fabric8:kubernetes-client:6.8.0') {
exclude group: 'com.fasterxml.jackson.dataformat', module: 'jackson-dataformat-yaml'
}

implementation 'io.github.microutils:kotlin-logging:3.0.0' // The last version bases on kotlin 1.6.0
implementation 'io.github.microutils:kotlin-logging:3.0.5'

testImplementation 'javax.annotation:javax.annotation-api:1.3.2'
testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"
Expand Down Expand Up @@ -317,6 +321,10 @@ protobuf {
}
}

tasks.named('generateProto') {enabled = false }
tasks.named('extractIncludeProto') {enabled = false }
tasks.named('extractIncludeTestFixturesProto') {enabled = false }

compileTestJava.dependsOn.add('generateTestProto')
processTestResources.dependsOn.add('generateTestProto')

Expand Down

0 comments on commit ee7668f

Please sign in to comment.