Merge branch 'TH2-5035' into 'master'

[TH2-5035] exclude okhttp See merge request vivarium/th2/th2-core-proprietary/th2-cradle-admin-tool!23
th2-net · Aug 15, 2023 · c55b509 · c55b509
2 parents 49a28a8 + c456b81
commit c55b509
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -49,7 +49,9 @@ allprojects {
 
     dependencies {
 
-        implementation "com.exactpro.th2:common:$commonVersion"
+        implementation("com.exactpro.th2:common:$commonVersion") {
+            exclude group: 'com.squareup.okhttp3', module: 'okhttp'
+        }
         implementation(platform("com.exactpro.th2:bom:4.4.0"))
         implementation "com.exactpro.th2:cradle-core:$cradleVersion"
         implementation "com.exactpro.th2:cradle-cassandra:$cradleVersion"

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-release_version = 1.7.0
+release_version = 1.7.1